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

Merge "Migrate DOZING update tron logging to Westworld" into rvc-dev am: 0d866af49e am: f58b53f6ca

Browse Source 
Change-Id: I2f0d4c6d4b48f4d46086970af79079c78010f0be
This commit is contained in:
Thiru Ramasamy
2020-04-30 01:12:11 +00:00
committed by Automerger Merge Worker
parent ccd6a9c6be f58b53f6ca
commit 68767cf4b3
1 changed files with 66 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
packages/SystemUI/src/com/android/systemui/doze/DozeTriggers.java
View File

@@ -34,6 +34,9 @@ import android.util.Log;
import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.UiEvent;
import com.android.internal.logging.UiEventLogger;
import com.android.internal.logging.UiEventLoggerImpl;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.systemui.Dependency;
import com.android.systemui.broadcast.BroadcastDispatcher;
@@ -45,6 +48,7 @@ import com.android.systemui.util.sensors.ProximitySensor;
import com.android.systemui.util.wakelock.WakeLock;
import java.io.PrintWriter;
import java.util.Optional;
import java.util.function.Consumer;
/**
@@ -58,6 +62,8 @@ public class DozeTriggers implements DozeMachine.Part {
/** adb shell am broadcast -a com.android.systemui.doze.pulse com.android.systemui */
private static final String PULSE_ACTION = "com.android.systemui.doze.pulse";
private static final UiEventLogger UI_EVENT_LOGGER = new UiEventLoggerImpl();
/**
* Last value sent by the wake-display sensor.
* Assuming that the screen should start on.
@@ -88,6 +94,62 @@ public class DozeTriggers implements DozeMachine.Part {
private final MetricsLogger mMetricsLogger = Dependency.get(MetricsLogger.class);
@VisibleForTesting
public enum DozingUpdateUiEvent implements UiEventLogger.UiEventEnum {
@UiEvent(doc = "Dozing updated due to notification.")
DOZING_UPDATE_NOTIFICATION(433),
@UiEvent(doc = "Dozing updated due to sigmotion.")
DOZING_UPDATE_SIGMOTION(434),
@UiEvent(doc = "Dozing updated because sensor was picked up.")
DOZING_UPDATE_SENSOR_PICKUP(435),
@UiEvent(doc = "Dozing updated because sensor was double tapped.")
DOZING_UPDATE_SENSOR_DOUBLE_TAP(436),
@UiEvent(doc = "Dozing updated because sensor was long squeezed.")
DOZING_UPDATE_SENSOR_LONG_SQUEEZE(437),
@UiEvent(doc = "Dozing updated due to docking.")
DOZING_UPDATE_DOCKING(438),
@UiEvent(doc = "Dozing updated because sensor woke up.")
DOZING_UPDATE_SENSOR_WAKEUP(439),
@UiEvent(doc = "Dozing updated because sensor woke up the lockscreen.")
DOZING_UPDATE_SENSOR_WAKE_LOCKSCREEN(440),
@UiEvent(doc = "Dozing updated because sensor was tapped.")
DOZING_UPDATE_SENSOR_TAP(441);
private final int mId;
DozingUpdateUiEvent(int id) {
mId = id;
}
@Override
public int getId() {
return mId;
}
static DozingUpdateUiEvent fromReason(int reason) {
switch (reason) {
case 1: return DOZING_UPDATE_NOTIFICATION;
case 2: return DOZING_UPDATE_SIGMOTION;
case 3: return DOZING_UPDATE_SENSOR_PICKUP;
case 4: return DOZING_UPDATE_SENSOR_DOUBLE_TAP;
case 5: return DOZING_UPDATE_SENSOR_LONG_SQUEEZE;
case 6: return DOZING_UPDATE_DOCKING;
case 7: return DOZING_UPDATE_SENSOR_WAKEUP;
case 8: return DOZING_UPDATE_SENSOR_WAKE_LOCKSCREEN;
case 9: return DOZING_UPDATE_SENSOR_TAP;
default: return null;
}
}
}
public DozeTriggers(Context context, DozeMachine machine, DozeHost dozeHost,
AlarmManager alarmManager, AmbientDisplayConfiguration config,
DozeParameters dozeParameters, AsyncSensorManager sensorManager, Handler handler,
@@ -225,6 +287,8 @@ public class DozeTriggers implements DozeMachine.Part {
mMetricsLogger.write(new LogMaker(MetricsEvent.DOZING)
.setType(MetricsEvent.TYPE_UPDATE)
.setSubtype(reason));
Optional.ofNullable(DozingUpdateUiEvent.fromReason(reason))
.ifPresent(UI_EVENT_LOGGER::log);
if (mDozeParameters.getDisplayNeedsBlanking()) {
// Let's prepare the display to wake-up by drawing black.
// This will cover the hardware wake-up sequence, where the display
@@ -402,6 +466,8 @@ public class DozeTriggers implements DozeMachine.Part {
// Logs request pulse reason on AOD screen.
mMetricsLogger.write(new LogMaker(MetricsEvent.DOZING)
.setType(MetricsEvent.TYPE_UPDATE).setSubtype(reason));
Optional.ofNullable(DozingUpdateUiEvent.fromReason(reason))
.ifPresent(UI_EVENT_LOGGER::log);
}
private boolean canPulse() {