am cf0e4706: am 8ff6d70d: Merge "Clear identity before calling into the mount service." into lmp-dev

* commit 'cf0e4706e341f2239591af5b6934cb266cb3db61':
  Clear identity before calling into the mount service.
This commit is contained in:
Svetoslav
2014-10-03 23:57:48 +00:00
committed by Android Git Automerger

View File

@@ -1610,10 +1610,15 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub {
if (userState.mUserId != UserHandle.USER_OWNER) { if (userState.mUserId != UserHandle.USER_OWNER) {
return; return;
} }
if (hasRunningServicesLocked(userState) && LockPatternUtils.isDeviceEncrypted()) { final long identity = Binder.clearCallingIdentity();
// If there are running accessibility services we do not have encryption as try {
// the user needs the accessibility layer to be running to authenticate. if (hasRunningServicesLocked(userState) && LockPatternUtils.isDeviceEncrypted()) {
mLockPatternUtils.clearEncryptionPassword(); // If there are running accessibility services we do not have encryption as
// the user needs the accessibility layer to be running to authenticate.
mLockPatternUtils.clearEncryptionPassword();
}
} finally {
Binder.restoreCallingIdentity(identity);
} }
} }