diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2018-01-27 01:18:20 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-01-27 01:18:20 +0000 |
| commit | ce01bd906e6153ff5458fee7a7e855d73855ac0a (patch) | |
| tree | 0e307bb36995cc8017ef6cea4e4ea7d744386690 /core/java/android | |
| parent | 92deeffdece67646e307073a4b710c96c43e9d2c (diff) | |
| parent | 8bdae8d682f922384de6076f3fa6db0f3d710b26 (diff) | |
Merge "Proto enums for DeviceIdleMode"
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/os/BatteryStats.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/core/java/android/os/BatteryStats.java b/core/java/android/os/BatteryStats.java index 03a8dba5a82c..fd0e5ae51892 100644 --- a/core/java/android/os/BatteryStats.java +++ b/core/java/android/os/BatteryStats.java @@ -20,6 +20,7 @@ import android.app.ActivityManager; import android.app.job.JobParameters; import android.content.Context; import android.content.pm.ApplicationInfo; +import android.server.ServerProtoEnums; import android.service.batterystats.BatteryStatsServiceDumpProto; import android.telephony.SignalStrength; import android.text.format.DateFormat; @@ -2054,17 +2055,17 @@ public abstract class BatteryStats implements Parcelable { /** * Constant for device idle mode: not active. */ - public static final int DEVICE_IDLE_MODE_OFF = 0; + public static final int DEVICE_IDLE_MODE_OFF = ServerProtoEnums.DEVICE_IDLE_MODE_OFF; // 0 /** * Constant for device idle mode: active in lightweight mode. */ - public static final int DEVICE_IDLE_MODE_LIGHT = 1; + public static final int DEVICE_IDLE_MODE_LIGHT = ServerProtoEnums.DEVICE_IDLE_MODE_LIGHT; // 1 /** * Constant for device idle mode: active in full mode. */ - public static final int DEVICE_IDLE_MODE_DEEP = 2; + public static final int DEVICE_IDLE_MODE_DEEP = ServerProtoEnums.DEVICE_IDLE_MODE_DEEP; // 2 /** * Returns the time in microseconds that device has been in idle mode while |