commit 0bd1eeaf90d854c487feb8ee35c5c74af28ebc74
author Android (Google) Code Review <android-gerrit@google.com> Mon Nov 30 17:38:57 2009 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Mon Nov 30 17:38:57 2009 -0800
tree 87be45449aa00275eb1c7549059178b2e37ceafa
parent a80a75f34a98fe1e41afab93c97aca505939903a
parent 21a67b8d97dafc5bcfc4b597bb156793292c04e9

Merge change I21a67b8d into eclair

* changes:
  docs: remove droid-specific behavior change from platform notes

core/java/android/server/BluetoothService.java

diff --git a/core/java/android/server/BluetoothService.java b/core/java/android/server/BluetoothService.java
index db9f34a..765d510 100644
--- a/core/java/android/server/BluetoothService.java
+++ b/core/java/android/server/BluetoothService.java
@@ -344,14 +344,14 @@
                 // records, use a DBUS call instead.
                 switch (msg.arg1) {
                 case 1:
-                    Log.d(TAG, "Registering hsag record");
-                    SystemService.start("hsag");
+                    Log.d(TAG, "Registering hfag record");
+                    SystemService.start("hfag");
                     mHandler.sendMessageDelayed(
                             mHandler.obtainMessage(MESSAGE_REGISTER_SDP_RECORDS, 2, -1), 500);
                     break;
                 case 2:
-                    Log.d(TAG, "Registering hfag record");
-                    SystemService.start("hfag");
+                    Log.d(TAG, "Registering hsag record");
+                    SystemService.start("hsag");
                     mHandler.sendMessageDelayed(
                             mHandler.obtainMessage(MESSAGE_REGISTER_SDP_RECORDS, 3, -1), 500);
                     break;

services/java/com/android/server/WindowManagerService.java

diff --git a/services/java/com/android/server/WindowManagerService.java b/services/java/com/android/server/WindowManagerService.java
index b4db7bc..44c9f0f 100644
--- a/services/java/com/android/server/WindowManagerService.java
+++ b/services/java/com/android/server/WindowManagerService.java
@@ -6397,7 +6397,9 @@
                             // Ignore
                         }
 
-                        if (eventType != TOUCH_EVENT
+                        if (ev.classType == RawInputEvent.CLASS_CONFIGURATION_CHANGED) {
+                            // do not wake screen in this case
+                        } else if (eventType != TOUCH_EVENT
                                 && eventType != LONG_TOUCH_EVENT
                                 && eventType != CHEEK_EVENT) {
                             mPowerManager.userActivity(curTime, false,

telephony/java/com/android/internal/telephony/gsm/SmsMessage.java

diff --git a/telephony/java/com/android/internal/telephony/gsm/SmsMessage.java b/telephony/java/com/android/internal/telephony/gsm/SmsMessage.java
index ebd60a9..d627baf 100644
--- a/telephony/java/com/android/internal/telephony/gsm/SmsMessage.java
+++ b/telephony/java/com/android/internal/telephony/gsm/SmsMessage.java
@@ -280,6 +280,7 @@
             // send it as a UCS-2 encoded message
             try {
                 userData = encodeUCS2(message, header);
+                encoding = ENCODING_16BIT;
             } catch(UnsupportedEncodingException uex) {
                 Log.e(LOG_TAG,
                         "Implausible UnsupportedEncodingException ",