Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a9a65af6 authored by Koji Fukui's avatar Koji Fukui Committed by android-build-merger
Browse files

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

Merge "Stop observing death of PrintManager listener when it is removed" am: e7240a52 am: 5cb172d1
am: 9e3ff42c

Change-Id: I3d643e52e86bbd4ff9bd588fba51fce82fbb35e9
parents 9769872d 9e3ff42c

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

+11 −0
Original line number Diff line number Diff line
@@ -597,6 +597,7 @@ final class UserState implements PrintSpoolerCallbacks, PrintServiceCallbacks, 
                PrintJobStateChangeListenerRecord record =

                        mPrintJobStateChangeListenerRecords.get(i);

                if (record.listener.asBinder().equals(listener.asBinder())) {

                    record.destroy();

                    mPrintJobStateChangeListenerRecords.remove(i);

                    break;

                }
@@ -639,6 +640,7 @@ final class UserState implements PrintSpoolerCallbacks, PrintServiceCallbacks, 
                ListenerRecord<IPrintServicesChangeListener> record =

                        mPrintServicesChangeListenerRecords.get(i);

                if (record.listener.asBinder().equals(listener.asBinder())) {

                    record.destroy();

                    mPrintServicesChangeListenerRecords.remove(i);

                    break;

                }
@@ -686,6 +688,7 @@ final class UserState implements PrintSpoolerCallbacks, PrintServiceCallbacks, 
                ListenerRecord<IRecommendationsChangeListener> record =

                        mPrintServiceRecommendationsChangeListenerRecords.get(i);

                if (record.listener.asBinder().equals(listener.asBinder())) {

                    record.destroy();

                    mPrintServiceRecommendationsChangeListenerRecords.remove(i);

                    break;

                }
@@ -1285,6 +1288,10 @@ final class UserState implements PrintSpoolerCallbacks, PrintServiceCallbacks, 
            listener.asBinder().linkToDeath(this, 0);

        }



        public void destroy() {

            listener.asBinder().unlinkToDeath(this, 0);

        }



        @Override

        public void binderDied() {

            listener.asBinder().unlinkToDeath(this, 0);
@@ -1302,6 +1309,10 @@ final class UserState implements PrintSpoolerCallbacks, PrintServiceCallbacks, 
            listener.asBinder().linkToDeath(this, 0);

        }



        public void destroy() {

            listener.asBinder().unlinkToDeath(this, 0);

        }



        @Override

        public void binderDied() {

            listener.asBinder().unlinkToDeath(this, 0);