commit e0daf8043fd4a9be995ff737d217b7b3514d4519
author Android (Google) Code Review <android-gerrit@google.com> Thu Aug 27 11:18:36 2009 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu Aug 27 11:18:36 2009 -0700
tree 76db0b20479c65d625e8f18dc6180ec215e1e704
parent 6ff90cf2b3148b51e6f900e2e86bcd1a2afb26d7
parent 42978e55fe438ecdc1b0bac5bf31c2aadbd9e78d

Merge change 22921 into eclair

* changes:
  An attempt to fix a deadlock between OMXCodec::start and upstream ::read

core/java/android/provider/Settings.java

diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index 9e3008b..77d1740 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -2968,15 +2968,33 @@
                 "gtalk_youtube_video_url";
 
         /**
+         * Chat message lifetime (for pruning old chat messages).
+         */
+        public static final String GTALK_CHAT_MESSAGE_LIFETIME =
+                "gtalk_chat_message_lifetime";
+
+        /**
+         * OTR message lifetime (for pruning old otr messages).
+         */
+        public static final String GTALK_OTR_MESSAGE_LIFETIME =
+                "gtalk_otr_message_lifetime";
+
+        /**
+         * Chat expiration time, i.e., time since last message in the chat (for pruning old chats).
+         */
+        public static final String GTALK_CHAT_EXPIRATION_TIME =
+                "gtalk_chat_expiration_time";
+
+        /**
          * This is the url for getting the app token for server-to-device push messaging.
          */
         public static final String PUSH_MESSAGING_REGISTRATION_URL =
                 "push_messaging_registration_url";
 
-	/**
-	 * Use android://<it> routing infos for Google Sync Server subcriptions.
-	 */
-	public static final String GSYNC_USE_RMQ2_ROUTING_INFO = "gsync_use_rmq2_routing_info";
+        /**
+         * Use android://<it> routing infos for Google Sync Server subcriptions.
+         */
+        public static final String GSYNC_USE_RMQ2_ROUTING_INFO = "gsync_use_rmq2_routing_info";
 
         /**
          * Enable use of ssl session caching.

core/java/android/view/View.java

diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index 1dd0096..425ccab 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -8742,7 +8742,8 @@
                 mLastColor = color;
                 color |= 0xFF000000;
 
-                shader = new LinearGradient(0, 0, 0, 1, color, 0, Shader.TileMode.CLAMP);
+                shader = new LinearGradient(0, 0, 0, 1, color | 0xFF000000,
+                        color & 0x00FFFFFF, Shader.TileMode.CLAMP);
 
                 paint.setShader(shader);
                 // Restore the default transfer mode (src_over)

media/java/android/media/AudioService.java

diff --git a/media/java/android/media/AudioService.java b/media/java/android/media/AudioService.java
index d1b9351..754d5a2 100644
--- a/media/java/android/media/AudioService.java
+++ b/media/java/android/media/AudioService.java
@@ -1381,7 +1381,8 @@
                             address);
                     mConnectedDevices.remove(AudioSystem.DEVICE_OUT_BLUETOOTH_A2DP);
                 } else if (!isConnected &&
-                           (state == BluetoothA2dp.STATE_CONNECTED || state != BluetoothA2dp.STATE_PLAYING)){
+                             (state == BluetoothA2dp.STATE_CONNECTED ||
+                              state == BluetoothA2dp.STATE_PLAYING)) {
                     AudioSystem.setDeviceConnectionState(AudioSystem.DEVICE_OUT_BLUETOOTH_A2DP,
                                                          AudioSystem.DEVICE_STATE_AVAILABLE,
                                                          address);