Merge "Still trigger DozeService when screen off." (d8d847cb) · Commits · e / os / android_frameworks_base

core/java/android/service/dreams/IDreamManager.aidl

+1 −0

Original line number	Diff line number	Diff line
		@@ -33,4 +33,5 @@ interface IDreamManager {
		void finishSelf(in IBinder token, boolean immediate);
		void startDozing(in IBinder token, int screenState, int screenBrightness);
		void stopDozing(in IBinder token);
		void forceAmbientDisplayEnabled(boolean enabled);
		}

services/core/java/com/android/server/dreams/DreamManagerService.java

+31 −8

Original line number	Diff line number	Diff line
		@@ -18,13 +18,6 @@ package com.android.server.dreams;

		import static android.Manifest.permission.BIND_DREAM_SERVICE;

		import com.android.internal.hardware.AmbientDisplayConfiguration;
		import com.android.internal.util.DumpUtils;
		import com.android.server.FgThread;
		import com.android.server.LocalServices;
		import com.android.server.SystemService;

		import android.Manifest;
		import android.app.ActivityManager;
		import android.content.BroadcastReceiver;
		import android.content.ComponentName;
		@@ -53,6 +46,12 @@ import android.service.dreams.IDreamManager;
		import android.util.Slog;
		import android.view.Display;

		import com.android.internal.hardware.AmbientDisplayConfiguration;
		import com.android.internal.util.DumpUtils;
		import com.android.server.FgThread;
		import com.android.server.LocalServices;
		import com.android.server.SystemService;

		import java.io.FileDescriptor;
		import java.io.PrintWriter;
		import java.util.ArrayList;
		@@ -84,6 +83,7 @@ public final class DreamManagerService extends SystemService {
		private boolean mCurrentDreamCanDoze;
		private boolean mCurrentDreamIsDozing;
		private boolean mCurrentDreamIsWaking;
		private boolean mForceAmbientDisplayEnabled;
		private int mCurrentDreamDozeScreenState = Display.STATE_UNKNOWN;
		private int mCurrentDreamDozeScreenBrightness = PowerManager.BRIGHTNESS_DEFAULT;

		@@ -139,6 +139,7 @@ public final class DreamManagerService extends SystemService {
		pw.println("mCurrentDreamCanDoze=" + mCurrentDreamCanDoze);
		pw.println("mCurrentDreamIsDozing=" + mCurrentDreamIsDozing);
		pw.println("mCurrentDreamIsWaking=" + mCurrentDreamIsWaking);
		pw.println("mForceAmbientDisplayEnabled=" + mForceAmbientDisplayEnabled);
		pw.println("mCurrentDreamDozeScreenState="
		+ Display.stateToString(mCurrentDreamDozeScreenState));
		pw.println("mCurrentDreamDozeScreenBrightness=" + mCurrentDreamDozeScreenBrightness);
		@@ -257,6 +258,16 @@ public final class DreamManagerService extends SystemService {
		}
		}

		private void forceAmbientDisplayEnabledInternal(boolean enabled) {
		if (DEBUG) {
		Slog.d(TAG, "Force ambient display enabled: " + enabled);
		}

		synchronized (mLock) {
		mForceAmbientDisplayEnabled = enabled;
		}
		}

		private ComponentName chooseDreamForUser(boolean doze, int userId) {
		if (doze) {
		ComponentName dozeComponent = getDozeComponent(userId);
		@@ -328,7 +339,7 @@ public final class DreamManagerService extends SystemService {
		}

		private ComponentName getDozeComponent(int userId) {
		if (mDozeConfig.enabled(userId)) {
		if (mForceAmbientDisplayEnabled \|\| mDozeConfig.enabled(userId)) {
		return ComponentName.unflattenFromString(mDozeConfig.ambientDisplayComponent());
		} else {
		return null;
		@@ -631,6 +642,18 @@ public final class DreamManagerService extends SystemService {
		Binder.restoreCallingIdentity(ident);
		}
		}

		@Override // Binder call
		public void forceAmbientDisplayEnabled(boolean enabled) {
		checkPermission(android.Manifest.permission.DEVICE_POWER);

		final long ident = Binder.clearCallingIdentity();
		try {
		forceAmbientDisplayEnabledInternal(enabled);
		} finally {
		Binder.restoreCallingIdentity(ident);
		}
		}
		}

		private final class LocalService extends DreamManagerInternal {