Merge "Add null check to destroyUiAutomationService" (d8a19718) · Commits · e / os / android_frameworks_base

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

+14 −13

Original line number	Diff line number	Diff line
		@@ -64,10 +64,8 @@ class UiAutomationManager {
		public void binderDied() {
		mUiAutomationServiceOwner.unlinkToDeath(this, 0);
		mUiAutomationServiceOwner = null;
		if (mUiAutomationService != null) {
		destroyUiAutomationService();
		}
		}
		};

		/**
		@@ -201,19 +199,22 @@ class UiAutomationManager {

		private void destroyUiAutomationService() {
		synchronized (mLock) {
		mUiAutomationService.mServiceInterface.asBinder().unlinkToDeath(mUiAutomationService,
		0);
		if (mUiAutomationService != null) {
		mUiAutomationService.mServiceInterface.asBinder().unlinkToDeath(
		mUiAutomationService, 0);
		mUiAutomationService.onRemoved();
		mUiAutomationService.resetLocked();
		mUiAutomationService = null;
		mUiAutomationFlags = 0;
		if (mUiAutomationServiceOwner != null) {
		mUiAutomationServiceOwner.unlinkToDeath(mUiAutomationServiceOwnerDeathRecipient, 0);
		mUiAutomationServiceOwner.unlinkToDeath(
		mUiAutomationServiceOwnerDeathRecipient, 0);
		mUiAutomationServiceOwner = null;
		}
		mSystemSupport.onClientChangeLocked(false);
		}
		}
		}

		private class UiAutomationService extends AbstractAccessibilityServiceConnection {
		private final Handler mMainHandler;