From 9117037dd3e25470a36408eaf54175400175b542 Mon Sep 17 00:00:00 2001
From: Gopal Krishna Shukla <gshukla@codeaurora.org>
Date: Thu, 19 Jul 2018 18:37:46 +0530
Subject: [PATCH] Avoid onServiceDisconnected() for unbind Service

onServiceDisconnected() and unbindLocked() both
are responsible to make mRemoteInstanceas null,
so ensure that the service is not unbinded already
while calling onServiceDisconnected()

Fixes:111631529
Test: Build Successful and device Running.
Change-Id: I505d97e32c4e76f06a358850e91fe189bf02654c
---
 .../java/com/android/server/print/RemotePrintSpooler.java   | 6 ++++--
 1 file 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 abd2244959cf7..64251dcfe20ee 100644
--- a/services/print/java/com/android/server/print/RemotePrintSpooler.java
+++ b/services/print/java/com/android/server/print/RemotePrintSpooler.java
@@ -705,8 +705,10 @@ final class RemotePrintSpooler {
         @Override
         public void onServiceDisconnected(ComponentName name) {
             synchronized (mLock) {
-                clearClientLocked();
-                mRemoteInstance = null;
+                if (mRemoteInstance != null) {
+                    clearClientLocked();
+                    mRemoteInstance = null;
+                }
             }
         }
     }