From f0847871eaf5cdcf697f07f013efee3d84d836f2 Mon Sep 17 00:00:00 2001 From: "Philip P. Moltmann" Date: Tue, 8 Mar 2016 13:26:38 -0800 Subject: [PATCH] If services are enabled, services might become enabled in the future Hence we always, always want to start a session if this is requested. Bug: 27643066 Change-Id: I0fbf3ea8554de83d5ec6dc61b6b36f3783aab427 --- .../print/java/com/android/server/print/UserState.java | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/services/print/java/com/android/server/print/UserState.java b/services/print/java/com/android/server/print/UserState.java index f2f555b553d53..8ab18788beaf6 100644 --- a/services/print/java/com/android/server/print/UserState.java +++ b/services/print/java/com/android/server/print/UserState.java @@ -443,10 +443,7 @@ final class UserState implements PrintSpoolerCallbacks, PrintServiceCallbacks { @Nullable List printerIds) { synchronized (mLock) { throwIfDestroyedLocked(); - // No services - nothing to do. - if (mActiveServices.isEmpty()) { - return; - } + // No session - nothing to do. if (mPrinterDiscoverySession == null) { return; @@ -460,10 +457,7 @@ final class UserState implements PrintSpoolerCallbacks, PrintServiceCallbacks { public void stopPrinterDiscovery(@NonNull IPrinterDiscoveryObserver observer) { synchronized (mLock) { throwIfDestroyedLocked(); - // No services - nothing to do. - if (mActiveServices.isEmpty()) { - return; - } + // No session - nothing to do. if (mPrinterDiscoverySession == null) { return;