Merge "Add an API for apps to get their System Health / Battery Stats data." into nyc-dev (04a72a2a) · Commits · e / os / android_frameworks_base

api/current.txt

+142 −0

Original line number	Diff line number	Diff line
		@@ -8142,6 +8142,7 @@ package android.content {
		field public static final java.lang.String SENSOR_SERVICE = "sensor";
		field public static final java.lang.String SHORTCUT_SERVICE = "shortcut";
		field public static final java.lang.String STORAGE_SERVICE = "storage";
		field public static final java.lang.String SYSTEM_HEALTH_SERVICE = "systemhealth";
		field public static final java.lang.String TELECOM_SERVICE = "telecom";
		field public static final java.lang.String TELEPHONY_SERVICE = "phone";
		field public static final java.lang.String TELEPHONY_SUBSCRIPTION_SERVICE = "telephony_subscription_service";
		@@ -29362,6 +29363,147 @@ package android.os {

		}

		package android.os.health {

		public class HealthStats {
		method public java.lang.String getDataType();
		method public long getMeasurement(int);
		method public int getMeasurementKeyAt(int);
		method public int getMeasurementKeyCount();
		method public java.util.Map<java.lang.String, java.lang.Long> getMeasurements(int);
		method public int getMeasurementsKeyAt(int);
		method public int getMeasurementsKeyCount();
		method public java.util.Map<java.lang.String, android.os.health.HealthStats> getStats(int);
		method public int getStatsKeyAt(int);
		method public int getStatsKeyCount();
		method public android.os.health.TimerStat getTimer(int);
		method public int getTimerCount(int);
		method public int getTimerKeyAt(int);
		method public int getTimerKeyCount();
		method public long getTimerTime(int);
		method public java.util.Map<java.lang.String, android.os.health.TimerStat> getTimers(int);
		method public int getTimersKeyAt(int);
		method public int getTimersKeyCount();
		method public boolean hasMeasurement(int);
		method public boolean hasMeasurements(int);
		method public boolean hasStats(int);
		method public boolean hasTimer(int);
		method public boolean hasTimers(int);
		}

		public final class PackageHealthStats {
		field public static final int MEASUREMENTS_WAKEUP_ALARMS_COUNT = 40002; // 0x9c42
		field public static final int STATS_SERVICES = 40001; // 0x9c41
		}

		public final class PidHealthStats {
		field public static final int MEASUREMENT_WAKE_NESTING_COUNT = 20001; // 0x4e21
		field public static final int MEASUREMENT_WAKE_START_MS = 20003; // 0x4e23
		field public static final int MEASUREMENT_WAKE_SUM_MS = 20002; // 0x4e22
		}

		public final class ProcessHealthStats {
		field public static final int MEASUREMENT_ANR_COUNT = 30005; // 0x7535
		field public static final int MEASUREMENT_CRASHES_COUNT = 30004; // 0x7534
		field public static final int MEASUREMENT_FOREGROUND_MS = 30006; // 0x7536
		field public static final int MEASUREMENT_STARTS_COUNT = 30003; // 0x7533
		field public static final int MEASUREMENT_SYSTEM_TIME_MS = 30002; // 0x7532
		field public static final int MEASUREMENT_USER_TIME_MS = 30001; // 0x7531
		}

		public final class ServiceHealthStats {
		field public static final int MEASUREMENT_LAUNCH_COUNT = 50002; // 0xc352
		field public static final int MEASUREMENT_START_SERVICE_COUNT = 50001; // 0xc351
		}

		public class SystemHealthManager {
		method public static android.os.health.SystemHealthManager from(android.content.Context);
		method public android.os.health.HealthStats takeMyUidSnapshot();
		method public android.os.health.HealthStats takeUidSnapshot(int);
		method public android.os.health.HealthStats[] takeUidSnapshots(int[]);
		}

		public class TimerStat implements android.os.Parcelable {
		ctor public TimerStat();
		ctor public TimerStat(int, long);
		ctor public TimerStat(android.os.Parcel);
		method public int describeContents();
		method public int getCount();
		method public long getTime();
		method public void setCount(int);
		method public void setTime(long);
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.os.health.TimerStat> CREATOR;
		}

		public final class UidHealthStats {
		field public static final int MEASUREMENT_BLUETOOTH_IDLE_MS = 10020; // 0x2724
		field public static final int MEASUREMENT_BLUETOOTH_POWER_MAMS = 10023; // 0x2727
		field public static final int MEASUREMENT_BLUETOOTH_RX_BYTES = 10052; // 0x2744
		field public static final int MEASUREMENT_BLUETOOTH_RX_MS = 10021; // 0x2725
		field public static final int MEASUREMENT_BLUETOOTH_RX_PACKETS = 10058; // 0x274a
		field public static final int MEASUREMENT_BLUETOOTH_TX_BYTES = 10053; // 0x2745
		field public static final int MEASUREMENT_BLUETOOTH_TX_MS = 10022; // 0x2726
		field public static final int MEASUREMENT_BLUETOOTH_TX_PACKETS = 10059; // 0x274b
		field public static final int MEASUREMENT_BUTTON_USER_ACTIVITY_COUNT = 10046; // 0x273e
		field public static final int MEASUREMENT_CPU_POWER_MAUS = 10064; // 0x2750
		field public static final int MEASUREMENT_MOBILE_IDLE_MS = 10024; // 0x2728
		field public static final int MEASUREMENT_MOBILE_POWER_MAMS = 10027; // 0x272b
		field public static final int MEASUREMENT_MOBILE_RX_BYTES = 10048; // 0x2740
		field public static final int MEASUREMENT_MOBILE_RX_MS = 10025; // 0x2729
		field public static final int MEASUREMENT_MOBILE_RX_PACKETS = 10054; // 0x2746
		field public static final int MEASUREMENT_MOBILE_TX_BYTES = 10049; // 0x2741
		field public static final int MEASUREMENT_MOBILE_TX_MS = 10026; // 0x272a
		field public static final int MEASUREMENT_MOBILE_TX_PACKETS = 10055; // 0x2747
		field public static final int MEASUREMENT_OTHER_USER_ACTIVITY_COUNT = 10045; // 0x273d
		field public static final int MEASUREMENT_REALTIME_BATTERY_MS = 10001; // 0x2711
		field public static final int MEASUREMENT_REALTIME_SCREEN_OFF_BATTERY_MS = 10003; // 0x2713
		field public static final int MEASUREMENT_SYSTEM_CPU_TIME_US = 10063; // 0x274f
		field public static final int MEASUREMENT_TOUCH_USER_ACTIVITY_COUNT = 10047; // 0x273f
		field public static final int MEASUREMENT_UPTIME_BATTERY_MS = 10002; // 0x2712
		field public static final int MEASUREMENT_UPTIME_SCREEN_OFF_BATTERY_MS = 10004; // 0x2714
		field public static final int MEASUREMENT_USER_CPU_TIME_US = 10062; // 0x274e
		field public static final int MEASUREMENT_WIFI_FULL_LOCK_MS = 10029; // 0x272d
		field public static final int MEASUREMENT_WIFI_IDLE_MS = 10016; // 0x2720
		field public static final int MEASUREMENT_WIFI_MULTICAST_MS = 10031; // 0x272f
		field public static final int MEASUREMENT_WIFI_POWER_MAMS = 10019; // 0x2723
		field public static final int MEASUREMENT_WIFI_RUNNING_MS = 10028; // 0x272c
		field public static final int MEASUREMENT_WIFI_RX_BYTES = 10050; // 0x2742
		field public static final int MEASUREMENT_WIFI_RX_MS = 10017; // 0x2721
		field public static final int MEASUREMENT_WIFI_RX_PACKETS = 10056; // 0x2748
		field public static final int MEASUREMENT_WIFI_TX_BYTES = 10051; // 0x2743
		field public static final int MEASUREMENT_WIFI_TX_MS = 10018; // 0x2722
		field public static final int MEASUREMENT_WIFI_TX_PACKETS = 10057; // 0x2749
		field public static final int STATS_PACKAGES = 10015; // 0x271f
		field public static final int STATS_PIDS = 10013; // 0x271d
		field public static final int STATS_PROCESSES = 10014; // 0x271e
		field public static final int TIMERS_JOBS = 10010; // 0x271a
		field public static final int TIMERS_SENSORS = 10012; // 0x271c
		field public static final int TIMERS_SYNCS = 10009; // 0x2719
		field public static final int TIMERS_WAKELOCKS_DRAW = 10008; // 0x2718
		field public static final int TIMERS_WAKELOCKS_FULL = 10005; // 0x2715
		field public static final int TIMERS_WAKELOCKS_PARTIAL = 10006; // 0x2716
		field public static final int TIMERS_WAKELOCKS_WINDOW = 10007; // 0x2717
		field public static final int TIMER_AUDIO = 10032; // 0x2730
		field public static final int TIMER_BLUETOOTH_SCAN = 10037; // 0x2735
		field public static final int TIMER_CAMERA = 10035; // 0x2733
		field public static final int TIMER_FLASHLIGHT = 10034; // 0x2732
		field public static final int TIMER_FOREGROUND_ACTIVITY = 10036; // 0x2734
		field public static final int TIMER_GPS_SENSOR = 10011; // 0x271b
		field public static final int TIMER_MOBILE_RADIO_ACTIVE = 10061; // 0x274d
		field public static final int TIMER_PROCESS_STATE_BACKGROUND_MS = 10042; // 0x273a
		field public static final int TIMER_PROCESS_STATE_CACHED_MS = 10043; // 0x273b
		field public static final int TIMER_PROCESS_STATE_FOREGROUND_MS = 10041; // 0x2739
		field public static final int TIMER_PROCESS_STATE_FOREGROUND_SERVICE_MS = 10039; // 0x2737
		field public static final int TIMER_PROCESS_STATE_TOP_MS = 10038; // 0x2736
		field public static final int TIMER_PROCESS_STATE_TOP_SLEEPING_MS = 10040; // 0x2738
		field public static final int TIMER_VIBRATOR = 10044; // 0x273c
		field public static final int TIMER_VIDEO = 10033; // 0x2731
		field public static final int TIMER_WIFI_SCAN = 10030; // 0x272e
		}

		}

		package android.os.storage {

		public abstract class OnObbStateChangeListener {

api/system-current.txt

+142 −0

Original line number	Diff line number	Diff line
		@@ -8448,6 +8448,7 @@ package android.content {
		field public static final java.lang.String SENSOR_SERVICE = "sensor";
		field public static final java.lang.String SHORTCUT_SERVICE = "shortcut";
		field public static final java.lang.String STORAGE_SERVICE = "storage";
		field public static final java.lang.String SYSTEM_HEALTH_SERVICE = "systemhealth";
		field public static final java.lang.String TELECOM_SERVICE = "telecom";
		field public static final java.lang.String TELEPHONY_SERVICE = "phone";
		field public static final java.lang.String TELEPHONY_SUBSCRIPTION_SERVICE = "telephony_subscription_service";
		@@ -31711,6 +31712,147 @@ package android.os {

		}

		package android.os.health {

		public class HealthStats {
		method public java.lang.String getDataType();
		method public long getMeasurement(int);
		method public int getMeasurementKeyAt(int);
		method public int getMeasurementKeyCount();
		method public java.util.Map<java.lang.String, java.lang.Long> getMeasurements(int);
		method public int getMeasurementsKeyAt(int);
		method public int getMeasurementsKeyCount();
		method public java.util.Map<java.lang.String, android.os.health.HealthStats> getStats(int);
		method public int getStatsKeyAt(int);
		method public int getStatsKeyCount();
		method public android.os.health.TimerStat getTimer(int);
		method public int getTimerCount(int);
		method public int getTimerKeyAt(int);
		method public int getTimerKeyCount();
		method public long getTimerTime(int);
		method public java.util.Map<java.lang.String, android.os.health.TimerStat> getTimers(int);
		method public int getTimersKeyAt(int);
		method public int getTimersKeyCount();
		method public boolean hasMeasurement(int);
		method public boolean hasMeasurements(int);
		method public boolean hasStats(int);
		method public boolean hasTimer(int);
		method public boolean hasTimers(int);
		}

		public final class PackageHealthStats {
		field public static final int MEASUREMENTS_WAKEUP_ALARMS_COUNT = 40002; // 0x9c42
		field public static final int STATS_SERVICES = 40001; // 0x9c41
		}

		public final class PidHealthStats {
		field public static final int MEASUREMENT_WAKE_NESTING_COUNT = 20001; // 0x4e21
		field public static final int MEASUREMENT_WAKE_START_MS = 20003; // 0x4e23
		field public static final int MEASUREMENT_WAKE_SUM_MS = 20002; // 0x4e22
		}

		public final class ProcessHealthStats {
		field public static final int MEASUREMENT_ANR_COUNT = 30005; // 0x7535
		field public static final int MEASUREMENT_CRASHES_COUNT = 30004; // 0x7534
		field public static final int MEASUREMENT_FOREGROUND_MS = 30006; // 0x7536
		field public static final int MEASUREMENT_STARTS_COUNT = 30003; // 0x7533
		field public static final int MEASUREMENT_SYSTEM_TIME_MS = 30002; // 0x7532
		field public static final int MEASUREMENT_USER_TIME_MS = 30001; // 0x7531
		}

		public final class ServiceHealthStats {
		field public static final int MEASUREMENT_LAUNCH_COUNT = 50002; // 0xc352
		field public static final int MEASUREMENT_START_SERVICE_COUNT = 50001; // 0xc351
		}

		public class SystemHealthManager {
		method public static android.os.health.SystemHealthManager from(android.content.Context);
		method public android.os.health.HealthStats takeMyUidSnapshot();
		method public android.os.health.HealthStats takeUidSnapshot(int);
		method public android.os.health.HealthStats[] takeUidSnapshots(int[]);
		}

		public class TimerStat implements android.os.Parcelable {
		ctor public TimerStat();
		ctor public TimerStat(int, long);
		ctor public TimerStat(android.os.Parcel);
		method public int describeContents();
		method public int getCount();
		method public long getTime();
		method public void setCount(int);
		method public void setTime(long);
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.os.health.TimerStat> CREATOR;
		}

		public final class UidHealthStats {
		field public static final int MEASUREMENT_BLUETOOTH_IDLE_MS = 10020; // 0x2724
		field public static final int MEASUREMENT_BLUETOOTH_POWER_MAMS = 10023; // 0x2727
		field public static final int MEASUREMENT_BLUETOOTH_RX_BYTES = 10052; // 0x2744
		field public static final int MEASUREMENT_BLUETOOTH_RX_MS = 10021; // 0x2725
		field public static final int MEASUREMENT_BLUETOOTH_RX_PACKETS = 10058; // 0x274a
		field public static final int MEASUREMENT_BLUETOOTH_TX_BYTES = 10053; // 0x2745
		field public static final int MEASUREMENT_BLUETOOTH_TX_MS = 10022; // 0x2726
		field public static final int MEASUREMENT_BLUETOOTH_TX_PACKETS = 10059; // 0x274b
		field public static final int MEASUREMENT_BUTTON_USER_ACTIVITY_COUNT = 10046; // 0x273e
		field public static final int MEASUREMENT_CPU_POWER_MAUS = 10064; // 0x2750
		field public static final int MEASUREMENT_MOBILE_IDLE_MS = 10024; // 0x2728
		field public static final int MEASUREMENT_MOBILE_POWER_MAMS = 10027; // 0x272b
		field public static final int MEASUREMENT_MOBILE_RX_BYTES = 10048; // 0x2740
		field public static final int MEASUREMENT_MOBILE_RX_MS = 10025; // 0x2729
		field public static final int MEASUREMENT_MOBILE_RX_PACKETS = 10054; // 0x2746
		field public static final int MEASUREMENT_MOBILE_TX_BYTES = 10049; // 0x2741
		field public static final int MEASUREMENT_MOBILE_TX_MS = 10026; // 0x272a
		field public static final int MEASUREMENT_MOBILE_TX_PACKETS = 10055; // 0x2747
		field public static final int MEASUREMENT_OTHER_USER_ACTIVITY_COUNT = 10045; // 0x273d
		field public static final int MEASUREMENT_REALTIME_BATTERY_MS = 10001; // 0x2711
		field public static final int MEASUREMENT_REALTIME_SCREEN_OFF_BATTERY_MS = 10003; // 0x2713
		field public static final int MEASUREMENT_SYSTEM_CPU_TIME_US = 10063; // 0x274f
		field public static final int MEASUREMENT_TOUCH_USER_ACTIVITY_COUNT = 10047; // 0x273f
		field public static final int MEASUREMENT_UPTIME_BATTERY_MS = 10002; // 0x2712
		field public static final int MEASUREMENT_UPTIME_SCREEN_OFF_BATTERY_MS = 10004; // 0x2714
		field public static final int MEASUREMENT_USER_CPU_TIME_US = 10062; // 0x274e
		field public static final int MEASUREMENT_WIFI_FULL_LOCK_MS = 10029; // 0x272d
		field public static final int MEASUREMENT_WIFI_IDLE_MS = 10016; // 0x2720
		field public static final int MEASUREMENT_WIFI_MULTICAST_MS = 10031; // 0x272f
		field public static final int MEASUREMENT_WIFI_POWER_MAMS = 10019; // 0x2723
		field public static final int MEASUREMENT_WIFI_RUNNING_MS = 10028; // 0x272c
		field public static final int MEASUREMENT_WIFI_RX_BYTES = 10050; // 0x2742
		field public static final int MEASUREMENT_WIFI_RX_MS = 10017; // 0x2721
		field public static final int MEASUREMENT_WIFI_RX_PACKETS = 10056; // 0x2748
		field public static final int MEASUREMENT_WIFI_TX_BYTES = 10051; // 0x2743
		field public static final int MEASUREMENT_WIFI_TX_MS = 10018; // 0x2722
		field public static final int MEASUREMENT_WIFI_TX_PACKETS = 10057; // 0x2749
		field public static final int STATS_PACKAGES = 10015; // 0x271f
		field public static final int STATS_PIDS = 10013; // 0x271d
		field public static final int STATS_PROCESSES = 10014; // 0x271e
		field public static final int TIMERS_JOBS = 10010; // 0x271a
		field public static final int TIMERS_SENSORS = 10012; // 0x271c
		field public static final int TIMERS_SYNCS = 10009; // 0x2719
		field public static final int TIMERS_WAKELOCKS_DRAW = 10008; // 0x2718
		field public static final int TIMERS_WAKELOCKS_FULL = 10005; // 0x2715
		field public static final int TIMERS_WAKELOCKS_PARTIAL = 10006; // 0x2716
		field public static final int TIMERS_WAKELOCKS_WINDOW = 10007; // 0x2717
		field public static final int TIMER_AUDIO = 10032; // 0x2730
		field public static final int TIMER_BLUETOOTH_SCAN = 10037; // 0x2735
		field public static final int TIMER_CAMERA = 10035; // 0x2733
		field public static final int TIMER_FLASHLIGHT = 10034; // 0x2732
		field public static final int TIMER_FOREGROUND_ACTIVITY = 10036; // 0x2734
		field public static final int TIMER_GPS_SENSOR = 10011; // 0x271b
		field public static final int TIMER_MOBILE_RADIO_ACTIVE = 10061; // 0x274d
		field public static final int TIMER_PROCESS_STATE_BACKGROUND_MS = 10042; // 0x273a
		field public static final int TIMER_PROCESS_STATE_CACHED_MS = 10043; // 0x273b
		field public static final int TIMER_PROCESS_STATE_FOREGROUND_MS = 10041; // 0x2739
		field public static final int TIMER_PROCESS_STATE_FOREGROUND_SERVICE_MS = 10039; // 0x2737
		field public static final int TIMER_PROCESS_STATE_TOP_MS = 10038; // 0x2736
		field public static final int TIMER_PROCESS_STATE_TOP_SLEEPING_MS = 10040; // 0x2738
		field public static final int TIMER_VIBRATOR = 10044; // 0x273c
		field public static final int TIMER_VIDEO = 10033; // 0x2731
		field public static final int TIMER_WIFI_SCAN = 10030; // 0x272e
		}

		}

		package android.os.storage {

		public abstract class OnObbStateChangeListener {

api/test-current.txt

+142 −0

File changed.

Preview size limit exceeded, changes collapsed.

core/java/android/app/SystemServiceRegistry.java

+8 −1

Original line number	Diff line number	Diff line
		@@ -103,6 +103,7 @@ import android.os.SystemVibrator;
		import android.os.UserHandle;
		import android.os.UserManager;
		import android.os.Vibrator;
		import android.os.health.SystemHealthManager;
		import android.os.storage.StorageManager;
		import android.print.IPrintManager;
		import android.print.PrintManager;
		@@ -747,7 +748,6 @@ final class SystemServiceRegistry {
		@Override
		public SoundTriggerManager createService(ContextImpl ctx) {
		IBinder b = ServiceManager.getService(Context.SOUND_TRIGGER_SERVICE);
		Log.i(TAG, "Creating new instance of SoundTriggerManager object.");
		return new SoundTriggerManager(ctx, ISoundTriggerService.Stub.asInterface(b));
		}});

		@@ -758,6 +758,13 @@ final class SystemServiceRegistry {
		IBinder b = ServiceManager.getService(Context.SHORTCUT_SERVICE);
		return new ShortcutManager(ctx, IShortcutService.Stub.asInterface(b));
		}});

		registerService(Context.SYSTEM_HEALTH_SERVICE, SystemHealthManager.class,
		new CachedServiceFetcher<SystemHealthManager>() {
		@Override
		public SystemHealthManager createService(ContextImpl ctx) {
		return new SystemHealthManager();
		}});
		}

		/**

core/java/android/content/Context.java

+9 −0

Original line number	Diff line number	Diff line
		@@ -3584,6 +3584,15 @@ public abstract class Context {
		*/
		public static final String SHORTCUT_SERVICE = "shortcut";

		/**
		* Use with {@link #getSystemService} to retrieve a
		* {@link android.os.health.SystemHealthManager} for accessing system health (battery, power,
		* memory, etc) metrics.
		*
		* @see #getSystemService
		*/
		public static final String SYSTEM_HEALTH_SERVICE = "systemhealth";

		/**
		* Determine whether the given permission is allowed for a particular
		* process and user ID running in the system.