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

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

Browse Source 
* commit '8ff6d70d44626cd515f517962378d89ab3954979':
  Clear identity before calling into the mount service.
This commit is contained in:
Svetoslav
2014-10-03 23:53:25 +00:00
committed by Android Git Automerger
parent c3493f943e 8ff6d70d44
commit cf0e4706e3
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java
View File

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