diff options
author | Gopal Krishna Shukla <gshukla@codeaurora.org> | 2018-07-19 18:37:46 +0530 |
---|---|---|
committer | Philip P. Moltmann <moltmann@google.com> | 2018-07-23 15:44:28 +0000 |
commit | 9117037dd3e25470a36408eaf54175400175b542 (patch) | |
tree | 5f48bb720c3f02ded11b1ddd0ccffea3bcd6782a /services/print | |
parent | 73200d9ac9438d95f28f0b9df3a7eddbfbf18eae (diff) |
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
Diffstat (limited to 'services/print')
-rw-r--r-- | services/print/java/com/android/server/print/RemotePrintSpooler.java | 6 |
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 abd2244959cf..64251dcfe20e 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; + } } } } |