Merge "Fix potential NPE when removing TaskOrganizerController" into rvc-dev am: b556cb7254 (6259ba98) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/wm/TaskOrganizerController.java

+17 −4

Original line number	Diff line number	Diff line
		@@ -78,9 +78,11 @@ class TaskOrganizerController extends ITaskOrganizerController.Stub {
		synchronized (mGlobalLock) {
		final TaskOrganizerState state = mTaskOrganizerStates.remove(
		mTaskOrganizer.asBinder());
		if (state != null) {
		state.dispose();
		}
		}
		}
		};

		private class TaskOrganizerState {
		@@ -222,10 +224,21 @@ class TaskOrganizerController extends ITaskOrganizerController.Stub {

		@Override
		public void unregisterTaskOrganizer(ITaskOrganizer organizer) {
		enforceStackPermission("unregisterTaskOrganizer()");
		final long origId = Binder.clearCallingIdentity();
		try {
		synchronized (mGlobalLock) {
		final TaskOrganizerState state = mTaskOrganizerStates.remove(organizer.asBinder());
		if (state == null) {
		return;
		}
		state.unlinkDeath();
		state.dispose();
		}
		} finally {
		Binder.restoreCallingIdentity(origId);
		}
		}

		ITaskOrganizer getTaskOrganizer(int windowingMode) {
		final IBinder organizer =