Merge \"Clear calling identity before calling mountService\" into nyc-dev

am: b2a45c00f6 Change-Id: I4f5856f2ea1d820ef6f67988222f2301a57a7585
2016-06-15 17:53:10 +00:00
parent ebd701ee3d b2a45c00f6
commit 0fd4da4981
1 changed files with 7 additions and 1 deletions
--- a/services/core/java/com/android/server/LockSettingsService.java
+++ b/services/core/java/com/android/server/LockSettingsService.java
@@ -1145,7 +1145,13 @@ public class LockSettingsService extends ILockSettings.Stub {

    private void fixateNewestUserKeyAuth(int userId)
            throws RemoteException {
-        getMountService().fixateNewestUserKeyAuth(userId);
+        final IMountService mountService = getMountService();
+        final long callingId = Binder.clearCallingIdentity();
+        try {
+            mountService.fixateNewestUserKeyAuth(userId);
+        } finally {
+            Binder.restoreCallingIdentity(callingId);
+        }
    }

    @Override