Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Check if records is inited before removing items" into nyc-dev

Browse Source 
am: f8a765bce2

* commit 'f8a765bce2656b6de2a75bf7a5a79adb6500fb3f':
  Check if records is inited before removing items

Change-Id: Ic589fa10e32c7a91f333d22a6493005574574903
This commit is contained in:
Philip P. Moltmann
2016-05-02 23:46:08 +00:00
committed by android-build-merger
parent 8522739ad6 f8a765bce2
commit 62f37b16a1
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
services/print/java/com/android/server/print/UserState.java
View File

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