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

Commit 640918f9 authored by Philip P. Moltmann's avatar Philip P. Moltmann
Browse files

Check if records is inited before removing items 

The record might already be removed and the records array set to null
when the binder dies, hence handle the scenario.

Bug: 28512952
Change-Id: Id21b03b6d14d1dc8cb792ee4ec0519287a289a33
parent 383189f4

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

                                }

                            }

                        }

                    });

        }

    }