Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "add dream start/stop logs" into rvc-dev am: 8b5b71ddd9

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11897359

Change-Id: Ia75711aeeb7390aed476f5b1ac4fb6fd100cfe20
This commit is contained in:
TreeHugger Robot
2020-06-18 14:41:08 +00:00
committed by Automerger Merge Worker
parent 439ca13a10 8b5b71ddd9
commit 1a422ecd7e
1 changed files with 35 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
services/core/java/com/android/server/dreams/DreamManagerService.java
View File

@@ -47,6 +47,10 @@ import android.service.dreams.IDreamManager;
import android.util.Slog; import android.util.Slog;
import android.view.Display; import android.view.Display;
import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.logging.UiEvent;
import com.android.internal.logging.UiEventLogger;
import com.android.internal.logging.UiEventLoggerImpl;
import com.android.internal.util.DumpUtils; import com.android.internal.util.DumpUtils;
import com.android.server.FgThread; import com.android.server.FgThread;
import com.android.server.LocalServices; import com.android.server.LocalServices;
@@ -77,6 +81,8 @@ public final class DreamManagerService extends SystemService {
private final PowerManagerInternal mPowerManagerInternal; private final PowerManagerInternal mPowerManagerInternal;
private final PowerManager.WakeLock mDozeWakeLock; private final PowerManager.WakeLock mDozeWakeLock;
private final ActivityTaskManagerInternal mAtmInternal; private final ActivityTaskManagerInternal mAtmInternal;
private final UiEventLogger mUiEventLogger;
private final ComponentName mAmbientDisplayComponent;
private Binder mCurrentDreamToken; private Binder mCurrentDreamToken;
private ComponentName mCurrentDreamName; private ComponentName mCurrentDreamName;
@@ -91,6 +97,26 @@ public final class DreamManagerService extends SystemService {
private AmbientDisplayConfiguration mDozeConfig; private AmbientDisplayConfiguration mDozeConfig;
@VisibleForTesting
public enum DreamManagerEvent implements UiEventLogger.UiEventEnum {
@UiEvent(doc = "The screensaver has started.")
DREAM_START(577),
@UiEvent(doc = "The screensaver has stopped.")
DREAM_STOP(578);
private final int mId;
DreamManagerEvent(int id) {
mId = id;
}
@Override
public int getId() {
return mId;
}
}
public DreamManagerService(Context context) { public DreamManagerService(Context context) {
super(context); super(context);
mContext = context; mContext = context;
@@ -102,6 +128,9 @@ public final class DreamManagerService extends SystemService {
mAtmInternal = getLocalService(ActivityTaskManagerInternal.class); mAtmInternal = getLocalService(ActivityTaskManagerInternal.class);
mDozeWakeLock = mPowerManager.newWakeLock(PowerManager.DOZE_WAKE_LOCK, TAG); mDozeWakeLock = mPowerManager.newWakeLock(PowerManager.DOZE_WAKE_LOCK, TAG);
mDozeConfig = new AmbientDisplayConfiguration(mContext); mDozeConfig = new AmbientDisplayConfiguration(mContext);
mUiEventLogger = new UiEventLoggerImpl();
AmbientDisplayConfiguration adc = new AmbientDisplayConfiguration(mContext);
mAmbientDisplayComponent = ComponentName.unflattenFromString(adc.ambientDisplayComponent());
} }
@Override @Override
@@ -388,6 +417,9 @@ public final class DreamManagerService extends SystemService {
.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "startDream"); .newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "startDream");
mHandler.post(wakeLock.wrap(() -> { mHandler.post(wakeLock.wrap(() -> {
mAtmInternal.notifyDreamStateChanged(true); mAtmInternal.notifyDreamStateChanged(true);
if (!mCurrentDreamName.equals(mAmbientDisplayComponent)) {
mUiEventLogger.log(DreamManagerEvent.DREAM_START);
}
mController.startDream(newToken, name, isTest, canDoze, userId, wakeLock); mController.startDream(newToken, name, isTest, canDoze, userId, wakeLock);
})); }));
} }
@@ -415,6 +447,9 @@ public final class DreamManagerService extends SystemService {
} }
private void cleanupDreamLocked() { private void cleanupDreamLocked() {
if (!mCurrentDreamName.equals(mAmbientDisplayComponent)) {
mUiEventLogger.log(DreamManagerEvent.DREAM_STOP);
}
mCurrentDreamToken = null; mCurrentDreamToken = null;
mCurrentDreamName = null; mCurrentDreamName = null;
mCurrentDreamIsTest = false; mCurrentDreamIsTest = false;