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

am: c38e0f19c1

Change-Id: I7d4f4929057490948ebbcb956eb3e2ba4aca6e3a

1 files changed, 4 insertions, 2 deletions

diff --git a/services/print/java/com/android/server/print/RemotePrintSpooler.java b/services/print/java/com/android/server/print/RemotePrintSpooler.java
index c1c32c28cb6b..774a3bc23e2b 100644
--- 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;
+                }
             }
         }
     }