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

Commit a31242b1 authored by Philip P. Moltmann's avatar Philip P. Moltmann Committed by android-build-merger
Browse files

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

am: 62f37b16

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

Change-Id: I79152f2b5a8b4a61f3490c0790d7eb42df4d96d2
parents 27e1f47a 62f37b16

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);

                                }

                            }

                        }

                    });

        }

    }