Merge "Avoid onServiceDisconnected() for unbind Service" am: a37c252248 am: c38e0f19c1

am: 2a126b05a2 Change-Id: I07e998923f88b3dd6b3c53ed74b0ed7deb14c08c
2018-07-23 12:34:53 -07:00
parent bc595fcfb1 2a126b05a2
commit 4775d87ca7
1 changed files with 4 additions and 2 deletions
--- a/services/print/java/com/android/server/print/RemotePrintSpooler.java
+++ b/services/print/java/com/android/server/print/RemotePrintSpooler.java
@@ -708,8 +708,10 @@ final class RemotePrintSpooler {
        @Override
        public void onServiceDisconnected(ComponentName name) {
            synchronized (mLock) {
-                clearClientLocked();
-                mRemoteInstance = null;
+                if (mRemoteInstance != null) {
+                    clearClientLocked();
+                    mRemoteInstance = null;
+                }
            }
        }
    }