Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: a482c6e5e6

* commit 'a482c6e5e61c2c01502a344240ef596dfbe84f26':
  Clear calling identity before calling mountService

Change-Id: I778323b472c0ec40087e8fbf19caa23913159f50
This commit is contained in:
Paul Crowley
2016-04-22 03:21:44 +00:00
committed by android-build-merger
parent 3987b9554f a482c6e5e6
commit f76f85501a
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/LockSettingsService.java
View File

@@ -1048,7 +1048,13 @@ public class LockSettingsService extends ILockSettings.Stub {
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