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

* commit '423bf3d0fc04e3ae3c00c0f64446778033a64f0b':
  Clear identity before calling into the mount service.
This commit is contained in:
Svetoslav
2014-10-04 00:04:52 +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) {
return;
}
if (hasRunningServicesLocked(userState) && LockPatternUtils.isDeviceEncrypted()) {
// 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();
final long identity = Binder.clearCallingIdentity();
try {
if (hasRunningServicesLocked(userState) && LockPatternUtils.isDeviceEncrypted()) {
// 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);
}
}