Merge "If services are enabled, services might become enabled in the future" into nyc-dev (bc84b89a) · Commits · e / os / android_frameworks_base

services/print/java/com/android/server/print/UserState.java

+2 −8

Original line number	Diff line number	Diff line
		@@ -443,10 +443,7 @@ final class UserState implements PrintSpoolerCallbacks, PrintServiceCallbacks {
		@Nullable List<PrinterId> 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;