summaryrefslogtreecommitdiff
path: root/services/print
diff options
context:
space:
mode:
authorGopal Krishna Shukla <gshukla@codeaurora.org>2018-07-23 12:10:57 -0700
committerandroid-build-merger <android-build-merger@google.com>2018-07-23 12:10:57 -0700
commitc38e0f19c10138bac8abba5f04a360c14f2fb9ae (patch)
tree86d913a717cb88ed28fef7ec43dda519338ef5dd /services/print
parenta36d57b7222aeefcf259a8d3b6783fb5e754052a (diff)
parenta37c25224889ccd5804cff425f9cd416f0bb3078 (diff)
Merge "Avoid onServiceDisconnected() for unbind Service"
am: a37c252248 Change-Id: I825afa6ce1a341f37687fb453a1eeda1ad19ae86
Diffstat (limited to 'services/print')
-rw-r--r--services/print/java/com/android/server/print/RemotePrintSpooler.java6
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;
+ }
}
}
}