Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f76f8550 authored by Paul Crowley's avatar Paul Crowley Committed by android-build-merger
Browse files

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

am: a482c6e5

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

Change-Id: I778323b472c0ec40087e8fbf19caa23913159f50
parents 3987b955 a482c6e5

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

+7 −1
Original line number Diff line number Diff line
@@ -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