commit a482c6e5e61c2c01502a344240ef596dfbe84f26
author Paul Crowley <paulcrowley@google.com> Fri Apr 22 03:00:10 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Apr 22 03:00:11 2016 +0000
tree 817e34db3042a1b0a64e4f05c5e42dd953c2854d
parent 0a7ec886c35107c1f8d2d1ff3977ac5dd91fddd1
parent 815036f055173d4dfcddd03a4e6c03d24bff00c7

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

services/core/java/com/android/server/LockSettingsService.java

diff --git a/services/core/java/com/android/server/LockSettingsService.java b/services/core/java/com/android/server/LockSettingsService.java
index 6c05173..bc9f69e 100644
--- a/services/core/java/com/android/server/LockSettingsService.java
+++ b/services/core/java/com/android/server/LockSettingsService.java
@@ -1048,7 +1048,13 @@
     private void changeUserKey(int userId, byte[] token, byte[] secret)
             throws RemoteException {
         final UserInfo userInfo = UserManager.get(mContext).getUserInfo(userId);
-        getMountService().changeUserKey(userId, userInfo.serialNumber, token, null, secret);
+        final IMountService mountService = getMountService();
+        final long callingId = Binder.clearCallingIdentity();
+        try {
+            mountService.changeUserKey(userId, userInfo.serialNumber, token, null, secret);
+        } finally {
+            Binder.restoreCallingIdentity(callingId);
+        }
     }
 
     @Override