Merge "Merge "Add null-checks to an optional dream service" into main am:... (4d15562a) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/policy/keyguard/KeyguardServiceDelegate.java

+3 −2

Original line number	Diff line number	Diff line
		@@ -176,9 +176,10 @@ public class KeyguardServiceDelegate {

		final DreamManagerInternal dreamManager =
		LocalServices.getService(DreamManagerInternal.class);

		if(dreamManager != null){
		dreamManager.registerDreamManagerStateListener(mDreamManagerStateListener);
		}
		}

		private final ServiceConnection mKeyguardConnection = new ServiceConnection() {
		@Override

+5 −3

Original line number	Diff line number	Diff line
		@@ -1379,8 +1379,10 @@ public final class PowerManagerService extends SystemService
		new DisplayGroupPowerChangeListener();
		mDisplayManagerInternal.registerDisplayGroupListener(displayGroupPowerChangeListener);

		if(mDreamManager != null){
		// This DreamManager method does not acquire a lock, so it should be safe to call.
		mDreamManager.registerDreamManagerStateListener(new DreamManagerStateListener());
		}

		mWirelessChargerDetector = mInjector.createWirelessChargerDetector(sensorManager,
		mInjector.createSuspendBlocker(
		@@ -3543,7 +3545,7 @@ public final class PowerManagerService extends SystemService
		}

		// Stop dream.
		if (isDreaming) {
		if (isDreaming && mDreamManager != null) {
		mDreamManager.stopDream(/* immediate= / false, "power manager request" /reason*/);
		}
		}