am a60fdfac: NPE in AccessibilityManagerService. (b9dec1c3) · Commits · e / os / android_frameworks_base

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

+8 −10

Original line number	Diff line number	Diff line
		@@ -1741,25 +1741,23 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub {

		@Override
		public void onServiceConnected(ComponentName componentName, IBinder service) {
		final int connectionId;
		synchronized (mLock) {
		connectionId = mId;
		mService = service;
		mServiceInterface = IAccessibilityServiceClient.Stub.asInterface(service);
		UserState userState = getUserStateLocked(mUserId);
		addServiceLocked(this, userState);
		if (!userState.mBindingServices.contains(mComponentName)) {
		binderDied();
		} else {
		if (userState.mBindingServices.contains(mComponentName)) {
		userState.mBindingServices.remove(mComponentName);
		onUserStateChangedLocked(userState);
		}
		}
		try {
		mServiceInterface.setConnection(this, connectionId);
		mServiceInterface.setConnection(this, mId);
		} catch (RemoteException re) {
		Slog.w(LOG_TAG, "Error while setting connection for service: " + service, re);
		}
		} else {
		binderDied();
		}
		}
		}

		@Override