Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7e0e9dd5 authored by Phil Weaver's avatar Phil Weaver Committed by android-build-merger
Browse files

Merge "Clear calling identity when binding a11y services" into nyc-dev 

am: b72c3065

* commit 'b72c3065':
  Clear calling identity when binding a11y services

Change-Id: I045bca4d88cdf22e84afd80534ddcb63a355302f
parents 93932ff3 b72c3065

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();