Merge "Merge "Avoid onServiceDisconnected() for unbind Service" am: a37c252248 am: c38e0f19c1 am: 2a126b05a2 am: 4775d87ca7"

2018-07-23 21:01:35 +00:00
parent 242bf1177f 11e9d9d1ba
commit 0256ebef77
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;
+                }
            }
        }
    }