From 9f70a4cc6dbdd7b509527cef892e8af3c8b09702 Mon Sep 17 00:00:00 2001 From: Svetoslav Date: Fri, 3 Oct 2014 16:32:23 -0700 Subject: [PATCH] Clear identity before calling into the mount service. bug:17787265 Change-Id: I4b9268d101e9ccfc30876fbf54bf28bb41fb4be6 --- .../accessibility/AccessibilityManagerService.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java b/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java index 8ab3588bff0fa..8b240668cd50c 100644 --- a/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java +++ b/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java @@ -1604,10 +1604,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); } }