From 5c38fc2b97cba8a275a24bdf201073d68b101e7a Mon Sep 17 00:00:00 2001 From: Alison Cichowlas Date: Wed, 25 Jan 2017 17:11:06 -0500 Subject: [PATCH] Migrate Tron logs for power to multimetric format. As best I can tell, values 3 & 4 (theoretically totalTouchDownTime & touchCycles, per PowerScreenStateParser) were always set to 0; I have not migrated these fields. Test: Manually checked old vs new logs side by side in event log. Change-Id: Ifbc32cd2006cc94327301bae7541ca25b14f0a40 --- .../core/java/com/android/server/power/Notifier.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/services/core/java/com/android/server/power/Notifier.java b/services/core/java/com/android/server/power/Notifier.java index b215998de2224..c31369e0c282d 100644 --- a/services/core/java/com/android/server/power/Notifier.java +++ b/services/core/java/com/android/server/power/Notifier.java @@ -22,6 +22,8 @@ import android.app.RetailDemoModeServiceInternal; import com.android.internal.app.IAppOpsService; import com.android.internal.app.IBatteryStats; +import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.server.EventLogTags; import com.android.server.LocalServices; @@ -32,6 +34,7 @@ import android.hardware.input.InputManagerInternal; import android.media.AudioManager; import android.media.Ringtone; import android.media.RingtoneManager; +import android.metrics.LogMaker; import android.net.Uri; import android.os.BatteryStats; import android.os.Handler; @@ -401,6 +404,10 @@ final class Notifier { mHandler.post(new Runnable() { @Override public void run() { + LogMaker log = new LogMaker(MetricsEvent.SCREEN); + log.setType(MetricsEvent.TYPE_OPEN); + log.setSubtype(0); // not user initiated + MetricsLogger.action(log); EventLog.writeEvent(EventLogTags.POWER_SCREEN_STATE, 1, 0, 0, 0); mPolicy.startedWakingUp(); } @@ -457,6 +464,10 @@ final class Notifier { mHandler.post(new Runnable() { @Override public void run() { + LogMaker log = new LogMaker(MetricsEvent.SCREEN); + log.setType(MetricsEvent.TYPE_CLOSE); + log.setSubtype(why); + MetricsLogger.action(log); EventLog.writeEvent(EventLogTags.POWER_SCREEN_STATE, 0, why, 0, 0); mPolicy.finishedGoingToSleep(why); }