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
This commit is contained in:
Philip P. Moltmann
2016-05-02 23:32:37 +00:00
committed by Android (Google) Code Review
parent 6a3948bc12 640918f911
commit f8a765bce2
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) { new PrintJobStateChangeListenerRecord(listener, appId) {
@Override @Override
public void onBinderDied() { 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) { new ListenerRecord<IRecommendationsChangeListener>(listener) {
@Override @Override
public void onBinderDied() { public void onBinderDied() {
mPrintServiceRecommendationsChangeListenerRecords.remove(this); synchronized (mLock) {
if (mPrintServiceRecommendationsChangeListenerRecords != null) {
mPrintServiceRecommendationsChangeListenerRecords.remove(this);
}
}
} }
}); });
} }