Merge "Clear calling identity when binding a11y services" into nyc-dev (b72c3065) · Commits · e / os / android_frameworks_base

services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java

+10 −5

Original line number	Diff line number	Diff line
		@@ -2296,12 +2296,17 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub {
		public boolean bindLocked() {
		UserState userState = getUserStateLocked(mUserId);
		if (!mIsAutomation) {
		final long identity = Binder.clearCallingIdentity();
		try {
		if (mService == null && mContext.bindServiceAsUser(
		mIntent, this,
		Context.BIND_AUTO_CREATE \| Context.BIND_FOREGROUND_SERVICE_WHILE_AWAKE,
		new UserHandle(mUserId))) {
		userState.mBindingServices.add(mComponentName);
		}
		} finally {
		Binder.restoreCallingIdentity(identity);
		}
		} else {
		userState.mBindingServices.add(mComponentName);
		mService = userState.mUiAutomationServiceClient.asBinder();