commit ce60d4b27e17d98423fd339f61e8b746866f1f4e
author Xavier Ducrohet <xav@google.com> Thu Jan 07 09:08:06 2010 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jan 07 09:08:06 2010 -0800
tree e0485a710042ddfd74adcf3e4bb8e40e0c59fc09
parent 0b6c6f2cbc7490c952141cee6a662ddcdb0bae5b
parent 82935938fa89e6acb1181eb621cb08828cd423c8

Merge "Move Layoutlib API library to sdk.git" into eclair

core/java/android/accounts/AccountManagerService.java

diff --git a/core/java/android/accounts/AccountManagerService.java b/core/java/android/accounts/AccountManagerService.java
index e312ac1..440668f 100644
--- a/core/java/android/accounts/AccountManagerService.java
+++ b/core/java/android/accounts/AccountManagerService.java
@@ -152,8 +152,7 @@
             new AtomicReference<AccountManagerService>();
 
     private static final boolean isDebuggableMonkeyBuild =
-            SystemProperties.getBoolean("monkey.running", false)
-                    && SystemProperties.getBoolean("ro.debuggable", false);
+            SystemProperties.getBoolean("ro.monkey", false);
     private static final Account[] EMPTY_ACCOUNT_ARRAY = new Account[]{};
 
     static {

core/java/android/server/BluetoothA2dpService.java

diff --git a/core/java/android/server/BluetoothA2dpService.java b/core/java/android/server/BluetoothA2dpService.java
index dfec1eb..46145b9 100644
--- a/core/java/android/server/BluetoothA2dpService.java
+++ b/core/java/android/server/BluetoothA2dpService.java
@@ -463,7 +463,8 @@
                 mAudioManager.setParameters("A2dpSuspended=false");
             }
 
-            if (state == BluetoothA2dp.STATE_CONNECTING ||
+            if (getSinkPriority(device) > BluetoothA2dp.PRIORITY_OFF &&
+                    state == BluetoothA2dp.STATE_CONNECTING ||
                     state == BluetoothA2dp.STATE_CONNECTED) {
                 // We have connected or attempting to connect.
                 // Bump priority

tools/aapt/Command.cpp

diff --git a/tools/aapt/Command.cpp b/tools/aapt/Command.cpp
index 0ef5d55..8be9db3 100644
--- a/tools/aapt/Command.cpp
+++ b/tools/aapt/Command.cpp
@@ -678,7 +678,7 @@
                                 REQ_NAVIGATION_ATTR, NULL, 0);
                         int32_t reqFiveWayNav = getIntegerAttribute(tree,
                                 REQ_FIVE_WAY_NAV_ATTR, NULL, 0);
-                        printf("uses-configuation:");
+                        printf("uses-configuration:");
                         if (reqTouchScreen != 0) {
                             printf(" reqTouchScreen='%d'", reqTouchScreen);
                         }