Merge "docs: Update developer docs make file to include API 23" into mnc-dev
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index cf28490..ae8cae8 100755
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -1267,7 +1267,7 @@
If this string is empty or the specified package does not exist, then
the platform will search for an SMS app and use that (if there is one)-->
- <string name="default_sms_application" translatable="false"></string>
+ <string name="default_sms_application" translatable="false">com.android.messaging</string>
<!-- Default web browser. This is the package name of the application that will
be the default browser when the device first boots. Afterwards the user
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/BluetoothControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/BluetoothControllerImpl.java
index daa84ad..a04edf7 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/BluetoothControllerImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/BluetoothControllerImpl.java
@@ -164,11 +164,18 @@
// Our current device is still valid.
return;
}
+ mLastDevice = null;
for (CachedBluetoothDevice device : getDevices()) {
if (device.isConnected()) {
mLastDevice = device;
}
}
+ if (mLastDevice == null && mConnectionState == BluetoothAdapter.STATE_CONNECTED) {
+ // If somehow we think we are connected, but have no connected devices, we aren't
+ // connected.
+ mConnectionState = BluetoothAdapter.STATE_DISCONNECTED;
+ mHandler.sendEmptyMessage(H.MSG_STATE_CHANGED);
+ }
}
@Override
diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java
index 2a79a47..489bcdb 100644
--- a/services/core/java/com/android/server/policy/PhoneWindowManager.java
+++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java
@@ -5493,10 +5493,6 @@
// may happen in a future call to goToSleep.
synchronized (mLock) {
mAwake = true;
- if (mKeyguardDelegate != null) {
- mHandler.removeMessages(MSG_KEYGUARD_DRAWN_TIMEOUT);
- mHandler.sendEmptyMessageDelayed(MSG_KEYGUARD_DRAWN_TIMEOUT, 1000);
- }
updateWakeGestureListenerLp();
updateOrientationListenerLp();
@@ -5586,6 +5582,8 @@
mScreenOnListener = screenOnListener;
if (mKeyguardDelegate != null) {
+ mHandler.removeMessages(MSG_KEYGUARD_DRAWN_TIMEOUT);
+ mHandler.sendEmptyMessageDelayed(MSG_KEYGUARD_DRAWN_TIMEOUT, 1000);
mKeyguardDelegate.onScreenTurningOn(mKeyguardDrawnCallback);
} else {
if (DEBUG_WAKEUP) Slog.d(TAG,