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

Merge "Add charging metrics" into pi-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2018-05-11 19:14:31 +00:00
committed by Android (Google) Code Review
parent 98fd4fa0f4 c4eb934499
commit cf4f650572
2 changed files with 76 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
proto/src/metrics_constants.proto
View File

@@ -5828,6 +5828,30 @@ message MetricsEvent {
// OS: P
DIALOG_SWITCH_HFP_DEVICES = 1416;
// ACTION: User has started or ended charging
// Type TYPE_DISMISS: Charging has ended
// Type TYPE_ACTION: Charging has started, contains fields: battery level
// Tag FIELD_BATTERY_LEVEL_START: Battery level at the start
// Tag FIELD_BATTERY_LEVEL_END: Battery level at the end
// Tag FIELD_CHARGING_DURATION: Time in ms phone was charging
// Tag FIELD_PLUG_TYPE: Charging plug type
ACTION_CHARGE = 1417;
// Tag used to determine battery level when device started charging
FIELD_BATTERY_LEVEL_START = 1418;
// Tag used to determine battery level when device ended charging
FIELD_BATTERY_LEVEL_END = 1419;
// Tag used to determine length of charging
FIELD_CHARGING_DURATION_MILLIS = 1420;
// Tag used to determine what type of charging was started/ended
// 1 = Plugged AC
// 2 = Plugged USB
// 3 = Wireless
FIELD_PLUG_TYPE = 1421;
// ---- End P Constants, all P constants go above this line ----
// Add new aosp constants above this line.
// END OF AOSP CONSTANTS

72
services/core/java/com/android/server/BatteryService.java
View File

@@ -16,36 +16,27 @@
package com.android.server;
import android.app.ActivityManagerInternal;
import android.database.ContentObserver;
import android.os.BatteryStats;
import android.os.Bundle;
import android.os.PowerManager;
import android.os.ResultReceiver;
import android.os.ShellCallback;
import android.os.ShellCommand;
import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.app.IBatteryStats;
import com.android.internal.util.DumpUtils;
import com.android.server.am.BatteryStatsService;
import com.android.server.lights.Light;
import com.android.server.lights.LightsManager;
import static com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import android.app.ActivityManager;
import android.app.ActivityManagerInternal;
import android.content.ContentResolver;
import android.content.Context;
import android.content.Intent;
import android.database.ContentObserver;
import android.hardware.health.V1_0.HealthInfo;
import android.hardware.health.V2_0.IHealth;
import android.hardware.health.V2_0.IHealthInfoCallback;
import android.hardware.health.V2_0.Result;
import android.hidl.manager.V1_0.IServiceManager;
import android.hidl.manager.V1_0.IServiceNotification;
import android.hardware.health.V1_0.HealthInfo;
import android.hardware.health.V2_0.IHealthInfoCallback;
import android.hardware.health.V2_0.IHealth;
import android.hardware.health.V2_0.Result;
import android.metrics.LogMaker;
import android.os.BatteryManager;
import android.os.BatteryManagerInternal;
import android.os.BatteryProperty;
import android.os.BatteryStats;
import android.os.Binder;
import android.os.Bundle;
import android.os.DropBoxManager;
import android.os.FileUtils;
import android.os.Handler;
@@ -54,8 +45,12 @@ import android.os.IBatteryPropertiesListener;
import android.os.IBatteryPropertiesRegistrar;
import android.os.IBinder;
import android.os.OsProtoEnums;
import android.os.PowerManager;
import android.os.RemoteException;
import android.os.ResultReceiver;
import android.os.ServiceManager;
import android.os.ShellCallback;
import android.os.ShellCommand;
import android.os.SystemClock;
import android.os.Trace;
import android.os.UEventObserver;
@@ -67,12 +62,19 @@ import android.util.MutableInt;
import android.util.Slog;
import android.util.proto.ProtoOutputStream;
import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.app.IBatteryStats;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.util.DumpUtils;
import com.android.server.am.BatteryStatsService;
import com.android.server.lights.Light;
import com.android.server.lights.LightsManager;
import java.io.File;
import java.io.FileDescriptor;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.PrintWriter;
import java.util.ArrayDeque;
import java.util.ArrayList;
import java.util.Arrays;
@@ -171,6 +173,9 @@ public final class BatteryService extends SystemService {
private long mDischargeStartTime;
private int mDischargeStartLevel;
private long mChargeStartTime;
private int mChargeStartLevel;
private boolean mUpdatesStopped;
private Led mLed;
@@ -185,6 +190,8 @@ public final class BatteryService extends SystemService {
private ArrayDeque<Bundle> mBatteryLevelsEventQueue;
private long mLastBatteryLevelChangedSentMs;
private MetricsLogger mMetricsLogger;
public BatteryService(Context context) {
super(context);
@@ -204,6 +211,7 @@ public final class BatteryService extends SystemService {
com.android.internal.R.integer.config_shutdownBatteryTemperature);
mBatteryLevelsEventQueue = new ArrayDeque<>();
mMetricsLogger = new MetricsLogger();
// watch for invalid charger messages if the invalid_charger switch exists
if (new File("/sys/devices/virtual/switch/invalid_charger/state").exists()) {
@@ -476,6 +484,15 @@ public final class BatteryService extends SystemService {
if (mPlugType != mLastPlugType) {
if (mLastPlugType == BATTERY_PLUGGED_NONE) {
// discharging -> charging
mChargeStartLevel = mHealthInfo.batteryLevel;
mChargeStartTime = SystemClock.elapsedRealtime();
final LogMaker builder = new LogMaker(MetricsEvent.ACTION_CHARGE);
builder.setType(MetricsEvent.TYPE_ACTION);
builder.addTaggedData(MetricsEvent.FIELD_PLUG_TYPE, mPlugType);
builder.addTaggedData(MetricsEvent.FIELD_BATTERY_LEVEL_START,
mHealthInfo.batteryLevel);
mMetricsLogger.write(builder);
// There's no value in this data unless we've discharged at least once and the
// battery level has changed; so don't log until it does.
@@ -491,6 +508,21 @@ public final class BatteryService extends SystemService {
// charging -> discharging or we just powered up
mDischargeStartTime = SystemClock.elapsedRealtime();
mDischargeStartLevel = mHealthInfo.batteryLevel;
long chargeDuration = SystemClock.elapsedRealtime() - mChargeStartTime;
if (mChargeStartTime != 0 && chargeDuration != 0) {
final LogMaker builder = new LogMaker(MetricsEvent.ACTION_CHARGE);
builder.setType(MetricsEvent.TYPE_DISMISS);
builder.addTaggedData(MetricsEvent.FIELD_PLUG_TYPE, mLastPlugType);
builder.addTaggedData(MetricsEvent.FIELD_CHARGING_DURATION_MILLIS,
chargeDuration);
builder.addTaggedData(MetricsEvent.FIELD_BATTERY_LEVEL_START,
mChargeStartLevel);
builder.addTaggedData(MetricsEvent.FIELD_BATTERY_LEVEL_END,
mHealthInfo.batteryLevel);
mMetricsLogger.write(builder);
}
mChargeStartTime = 0;
}
}
if (mHealthInfo.batteryStatus != mLastBatteryStatus ||