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

Merge "Stop observing death of PrintManager listener when it is removed"

Browse Source
This commit is contained in:
Treehugger Robot
2017-11-13 20:42:09 +00:00
committed by Gerrit Code Review
parent f8fdb06c27 05b6857f6b
commit e7240a52e2
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -586,6 +586,7 @@ final class UserState implements PrintSpoolerCallbacks, PrintServiceCallbacks,
PrintJobStateChangeListenerRecord record = PrintJobStateChangeListenerRecord record =
mPrintJobStateChangeListenerRecords.get(i); mPrintJobStateChangeListenerRecords.get(i);
if (record.listener.asBinder().equals(listener.asBinder())) { if (record.listener.asBinder().equals(listener.asBinder())) {
record.destroy();
mPrintJobStateChangeListenerRecords.remove(i); mPrintJobStateChangeListenerRecords.remove(i);
break; break;
} }
@@ -628,6 +629,7 @@ final class UserState implements PrintSpoolerCallbacks, PrintServiceCallbacks,
ListenerRecord<IPrintServicesChangeListener> record = ListenerRecord<IPrintServicesChangeListener> record =
mPrintServicesChangeListenerRecords.get(i); mPrintServicesChangeListenerRecords.get(i);
if (record.listener.asBinder().equals(listener.asBinder())) { if (record.listener.asBinder().equals(listener.asBinder())) {
record.destroy();
mPrintServicesChangeListenerRecords.remove(i); mPrintServicesChangeListenerRecords.remove(i);
break; break;
} }
@@ -675,6 +677,7 @@ final class UserState implements PrintSpoolerCallbacks, PrintServiceCallbacks,
ListenerRecord<IRecommendationsChangeListener> record = ListenerRecord<IRecommendationsChangeListener> record =
mPrintServiceRecommendationsChangeListenerRecords.get(i); mPrintServiceRecommendationsChangeListenerRecords.get(i);
if (record.listener.asBinder().equals(listener.asBinder())) { if (record.listener.asBinder().equals(listener.asBinder())) {
record.destroy();
mPrintServiceRecommendationsChangeListenerRecords.remove(i); mPrintServiceRecommendationsChangeListenerRecords.remove(i);
break; break;
} }
@@ -1222,6 +1225,10 @@ final class UserState implements PrintSpoolerCallbacks, PrintServiceCallbacks,
listener.asBinder().linkToDeath(this, 0); listener.asBinder().linkToDeath(this, 0);
} }
public void destroy() {
listener.asBinder().unlinkToDeath(this, 0);
}
@Override @Override
public void binderDied() { public void binderDied() {
listener.asBinder().unlinkToDeath(this, 0); listener.asBinder().unlinkToDeath(this, 0);
@@ -1239,6 +1246,10 @@ final class UserState implements PrintSpoolerCallbacks, PrintServiceCallbacks,
listener.asBinder().linkToDeath(this, 0); listener.asBinder().linkToDeath(this, 0);
} }
public void destroy() {
listener.asBinder().unlinkToDeath(this, 0);
}
@Override @Override
public void binderDied() { public void binderDied() {
listener.asBinder().unlinkToDeath(this, 0); listener.asBinder().unlinkToDeath(this, 0);