Merge "Check if records is inited before removing items" into nyc-dev (f8a765bc) · Commits · e / os / android_frameworks_base

services/print/java/com/android/server/print/UserState.java

+10 −2

Original line number	Diff line number	Diff line
		@@ -555,8 +555,12 @@ final class UserState implements PrintSpoolerCallbacks, PrintServiceCallbacks,
		new PrintJobStateChangeListenerRecord(listener, appId) {
		@Override
		public void onBinderDied() {
		synchronized (mLock) {
		if (mPrintJobStateChangeListenerRecords != null) {
		mPrintJobStateChangeListenerRecords.remove(this);
		}
		}
		}
		});
		}
		}
		@@ -639,8 +643,12 @@ final class UserState implements PrintSpoolerCallbacks, PrintServiceCallbacks,
		new ListenerRecord<IRecommendationsChangeListener>(listener) {
		@Override
		public void onBinderDied() {
		synchronized (mLock) {
		if (mPrintServiceRecommendationsChangeListenerRecords != null) {
		mPrintServiceRecommendationsChangeListenerRecords.remove(this);
		}
		}
		}
		});
		}
		}