commit 4aff3d53efc552aa30e25bf366bcb6e956d8b0e3
author Andrew Zeng <zenga@google.com> Thu Mar 16 23:03:02 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Mar 16 23:03:06 2017 +0000
tree 45ff4532da041e3ba55117fb3ca0684783b65a74
parent c1a593902601c85e5c95f0eee39980fcfcad7447
parent 750563ee508e3ad9af6a70ccc669c070f892cfcb

Merge "Fix NPE in LockSettingsService." into cw-f-dev

core/res/AndroidManifest.xml

diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index 953f2b9..6c64247 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -197,6 +197,8 @@
     <protected-broadcast android:name="android.btopp.intent.action.OPEN" />
     <protected-broadcast android:name="android.btopp.intent.action.OPEN_INBOUND" />
     <protected-broadcast android:name="android.btopp.intent.action.TRANSFER_COMPLETE" />
+    <protected-broadcast android:name="android.btopp.intent.action.ACCEPT" />
+    <protected-broadcast android:name="android.btopp.intent.action.DECLINE" />
     <protected-broadcast android:name="com.android.bluetooth.gatt.REFRESH_BATCHED_SCAN" />
     <protected-broadcast android:name="com.android.bluetooth.pbap.authchall" />
     <protected-broadcast android:name="com.android.bluetooth.pbap.userconfirmtimeout" />

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
index 6624e21..57a3d9d 100644
--- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
@@ -3754,7 +3754,12 @@
 
     private boolean isActivePasswordSufficientForUserLocked(
             DevicePolicyData policy, int userHandle, boolean parent) {
-        enforceUserUnlocked(userHandle, parent);
+        final long id = Binder.clearCallingIdentity();
+        try {
+            enforceUserUnlocked(userHandle, parent);
+        } finally {
+            Binder.restoreCallingIdentity(id);
+        }
 
         final int requiredPasswordQuality = getPasswordQuality(null, userHandle, parent);
         if (policy.mActivePasswordQuality < requiredPasswordQuality) {