Merge "HardwarePropertiesManager: Add API for hardware properties retrieval" (8b8b2429) · Commits · e / os / android_frameworks_base

api/current.txt

+21 −0

Original line number	Original line	Diff line number	Diff line
	@@ -8037,6 +8037,7 @@ package android.content {
	field public static final java.lang.String DOWNLOAD_SERVICE = "download";		field public static final java.lang.String DOWNLOAD_SERVICE = "download";
	field public static final java.lang.String DROPBOX_SERVICE = "dropbox";		field public static final java.lang.String DROPBOX_SERVICE = "dropbox";
	field public static final java.lang.String FINGERPRINT_SERVICE = "fingerprint";		field public static final java.lang.String FINGERPRINT_SERVICE = "fingerprint";
			field public static final java.lang.String HARDWARE_PROPERTIES_SERVICE = "hardwareproperties";
	field public static final java.lang.String INPUT_METHOD_SERVICE = "input_method";		field public static final java.lang.String INPUT_METHOD_SERVICE = "input_method";
	field public static final java.lang.String INPUT_SERVICE = "input";		field public static final java.lang.String INPUT_SERVICE = "input";
	field public static final java.lang.String JOB_SCHEDULER_SERVICE = "jobscheduler";		field public static final java.lang.String JOB_SCHEDULER_SERVICE = "jobscheduler";
	@@ -27892,6 +27893,14 @@ package android.os {
	method public final synchronized android.os.CountDownTimer start();		method public final synchronized android.os.CountDownTimer start();
	}		}

			public final class CpuUsageInfo implements android.os.Parcelable {
			method public int describeContents();
			method public long getActive();
			method public long getTotal();
			method public void writeToParcel(android.os.Parcel, int);
			field public static final android.os.Parcelable.Creator<android.os.CpuUsageInfo> CREATOR;
			}

	public class DeadObjectException extends android.os.RemoteException {		public class DeadObjectException extends android.os.RemoteException {
	ctor public DeadObjectException();		ctor public DeadObjectException();
	ctor public DeadObjectException(java.lang.String);		ctor public DeadObjectException(java.lang.String);
	@@ -28144,6 +28153,18 @@ package android.os {
	method public boolean quitSafely();		method public boolean quitSafely();
	}		}

			public class HardwarePropertiesManager {
			method public android.os.CpuUsageInfo[] getCpuUsages();
			method public float[] getDeviceTemperatures(int);
			method public float[] getFanSpeeds();
			field public static final int DEVICE_TEMPERATURE_BATTERY = 2; // 0x2
			field public static final int DEVICE_TEMPERATURE_CPU = 0; // 0x0
			field public static final int DEVICE_TEMPERATURE_GPU = 1; // 0x1
			}

			public static abstract class HardwarePropertiesManager.DeviceTemperatureType implements java.lang.annotation.Annotation {
			}

	public abstract interface IBinder {		public abstract interface IBinder {
	method public abstract void dump(java.io.FileDescriptor, java.lang.String[]) throws android.os.RemoteException;		method public abstract void dump(java.io.FileDescriptor, java.lang.String[]) throws android.os.RemoteException;
	method public abstract void dumpAsync(java.io.FileDescriptor, java.lang.String[]) throws android.os.RemoteException;		method public abstract void dumpAsync(java.io.FileDescriptor, java.lang.String[]) throws android.os.RemoteException;

api/system-current.txt

+21 −0

Original line number	Original line	Diff line number	Diff line
	@@ -8331,6 +8331,7 @@ package android.content {
	field public static final java.lang.String DOWNLOAD_SERVICE = "download";		field public static final java.lang.String DOWNLOAD_SERVICE = "download";
	field public static final java.lang.String DROPBOX_SERVICE = "dropbox";		field public static final java.lang.String DROPBOX_SERVICE = "dropbox";
	field public static final java.lang.String FINGERPRINT_SERVICE = "fingerprint";		field public static final java.lang.String FINGERPRINT_SERVICE = "fingerprint";
			field public static final java.lang.String HARDWARE_PROPERTIES_SERVICE = "hardwareproperties";
	field public static final java.lang.String HDMI_CONTROL_SERVICE = "hdmi_control";		field public static final java.lang.String HDMI_CONTROL_SERVICE = "hdmi_control";
	field public static final java.lang.String INPUT_METHOD_SERVICE = "input_method";		field public static final java.lang.String INPUT_METHOD_SERVICE = "input_method";
	field public static final java.lang.String INPUT_SERVICE = "input";		field public static final java.lang.String INPUT_SERVICE = "input";
	@@ -29967,6 +29968,14 @@ package android.os {
	method public final synchronized android.os.CountDownTimer start();		method public final synchronized android.os.CountDownTimer start();
	}		}

			public final class CpuUsageInfo implements android.os.Parcelable {
			method public int describeContents();
			method public long getActive();
			method public long getTotal();
			method public void writeToParcel(android.os.Parcel, int);
			field public static final android.os.Parcelable.Creator<android.os.CpuUsageInfo> CREATOR;
			}

	public class DeadObjectException extends android.os.RemoteException {		public class DeadObjectException extends android.os.RemoteException {
	ctor public DeadObjectException();		ctor public DeadObjectException();
	ctor public DeadObjectException(java.lang.String);		ctor public DeadObjectException(java.lang.String);
	@@ -30219,6 +30228,18 @@ package android.os {
	method public boolean quitSafely();		method public boolean quitSafely();
	}		}

			public class HardwarePropertiesManager {
			method public android.os.CpuUsageInfo[] getCpuUsages();
			method public float[] getDeviceTemperatures(int);
			method public float[] getFanSpeeds();
			field public static final int DEVICE_TEMPERATURE_BATTERY = 2; // 0x2
			field public static final int DEVICE_TEMPERATURE_CPU = 0; // 0x0
			field public static final int DEVICE_TEMPERATURE_GPU = 1; // 0x1
			}

			public static abstract class HardwarePropertiesManager.DeviceTemperatureType implements java.lang.annotation.Annotation {
			}

	public abstract interface IBinder {		public abstract interface IBinder {
	method public abstract void dump(java.io.FileDescriptor, java.lang.String[]) throws android.os.RemoteException;		method public abstract void dump(java.io.FileDescriptor, java.lang.String[]) throws android.os.RemoteException;
	method public abstract void dumpAsync(java.io.FileDescriptor, java.lang.String[]) throws android.os.RemoteException;		method public abstract void dumpAsync(java.io.FileDescriptor, java.lang.String[]) throws android.os.RemoteException;

api/test-current.txt

+21 −0

Original line number	Original line	Diff line number	Diff line
	@@ -8041,6 +8041,7 @@ package android.content {
	field public static final java.lang.String DOWNLOAD_SERVICE = "download";		field public static final java.lang.String DOWNLOAD_SERVICE = "download";
	field public static final java.lang.String DROPBOX_SERVICE = "dropbox";		field public static final java.lang.String DROPBOX_SERVICE = "dropbox";
	field public static final java.lang.String FINGERPRINT_SERVICE = "fingerprint";		field public static final java.lang.String FINGERPRINT_SERVICE = "fingerprint";
			field public static final java.lang.String HARDWARE_PROPERTIES_SERVICE = "hardwareproperties";
	field public static final java.lang.String INPUT_METHOD_SERVICE = "input_method";		field public static final java.lang.String INPUT_METHOD_SERVICE = "input_method";
	field public static final java.lang.String INPUT_SERVICE = "input";		field public static final java.lang.String INPUT_SERVICE = "input";
	field public static final java.lang.String JOB_SCHEDULER_SERVICE = "jobscheduler";		field public static final java.lang.String JOB_SCHEDULER_SERVICE = "jobscheduler";
	@@ -27900,6 +27901,14 @@ package android.os {
	method public final synchronized android.os.CountDownTimer start();		method public final synchronized android.os.CountDownTimer start();
	}		}

			public final class CpuUsageInfo implements android.os.Parcelable {
			method public int describeContents();
			method public long getActive();
			method public long getTotal();
			method public void writeToParcel(android.os.Parcel, int);
			field public static final android.os.Parcelable.Creator<android.os.CpuUsageInfo> CREATOR;
			}

	public class DeadObjectException extends android.os.RemoteException {		public class DeadObjectException extends android.os.RemoteException {
	ctor public DeadObjectException();		ctor public DeadObjectException();
	ctor public DeadObjectException(java.lang.String);		ctor public DeadObjectException(java.lang.String);
	@@ -28152,6 +28161,18 @@ package android.os {
	method public boolean quitSafely();		method public boolean quitSafely();
	}		}

			public class HardwarePropertiesManager {
			method public android.os.CpuUsageInfo[] getCpuUsages();
			method public float[] getDeviceTemperatures(int);
			method public float[] getFanSpeeds();
			field public static final int DEVICE_TEMPERATURE_BATTERY = 2; // 0x2
			field public static final int DEVICE_TEMPERATURE_CPU = 0; // 0x0
			field public static final int DEVICE_TEMPERATURE_GPU = 1; // 0x1
			}

			public static abstract class HardwarePropertiesManager.DeviceTemperatureType implements java.lang.annotation.Annotation {
			}

	public abstract interface IBinder {		public abstract interface IBinder {
	method public abstract void dump(java.io.FileDescriptor, java.lang.String[]) throws android.os.RemoteException;		method public abstract void dump(java.io.FileDescriptor, java.lang.String[]) throws android.os.RemoteException;
	method public abstract void dumpAsync(java.io.FileDescriptor, java.lang.String[]) throws android.os.RemoteException;		method public abstract void dumpAsync(java.io.FileDescriptor, java.lang.String[]) throws android.os.RemoteException;

core/java/android/app/SystemServiceRegistry.java

+7 −0

Original line number	Original line	Diff line number	Diff line
	@@ -85,6 +85,7 @@ import android.net.wifi.p2p.WifiP2pManager;
	import android.nfc.NfcManager;		import android.nfc.NfcManager;
	import android.os.BatteryManager;		import android.os.BatteryManager;
	import android.os.DropBoxManager;		import android.os.DropBoxManager;
			import android.os.HardwarePropertiesManager;
	import android.os.IBinder;		import android.os.IBinder;
	import android.os.IPowerManager;		import android.os.IPowerManager;
	import android.os.IUserManager;		import android.os.IUserManager;
	@@ -707,6 +708,12 @@ final class SystemServiceRegistry {
	public RadioManager createService(ContextImpl ctx) {		public RadioManager createService(ContextImpl ctx) {
	return new RadioManager(ctx);		return new RadioManager(ctx);
	}});		}});
			registerService(Context.HARDWARE_PROPERTIES_SERVICE, HardwarePropertiesManager.class,
			new CachedServiceFetcher<HardwarePropertiesManager>() {
			@Override
			public HardwarePropertiesManager createService(ContextImpl ctx) {
			return new HardwarePropertiesManager();
			}});
	}		}

	/**		/**

core/java/android/content/Context.java

+14 −0

Original line number	Original line	Diff line number	Diff line
	@@ -48,6 +48,7 @@ import android.net.Uri;
	import android.os.Bundle;		import android.os.Bundle;
	import android.os.Environment;		import android.os.Environment;
	import android.os.Handler;		import android.os.Handler;
			import android.os.HardwarePropertiesManager;
	import android.os.IBinder;		import android.os.IBinder;
	import android.os.Looper;		import android.os.Looper;
	import android.os.StatFs;		import android.os.StatFs;
	@@ -2611,6 +2612,7 @@ public abstract class Context {
	MEDIA_PROJECTION_SERVICE,		MEDIA_PROJECTION_SERVICE,
	MIDI_SERVICE,		MIDI_SERVICE,
	RADIO_SERVICE,		RADIO_SERVICE,
			HARDWARE_PROPERTIES_SERVICE,
	})		})
	@Retention(RetentionPolicy.SOURCE)		@Retention(RetentionPolicy.SOURCE)
	public @interface ServiceName {}		public @interface ServiceName {}
	@@ -2672,6 +2674,8 @@ public abstract class Context {
	* <dt> {@link #NETWORK_STATS_SERVICE} ("netstats")		* <dt> {@link #NETWORK_STATS_SERVICE} ("netstats")
	* <dd> A {@link android.app.usage.NetworkStatsManager NetworkStatsManager} for querying network		* <dd> A {@link android.app.usage.NetworkStatsManager NetworkStatsManager} for querying network
	* usage statistics.		* usage statistics.
			* <dt> {@link #HARDWARE_PROPERTIES_SERVICE} ("hardwareproperties")
			* <dd> A {@link android.os.HardwarePropertiesManager} for accessing hardware properties.
	* </dl>		* </dl>
	*		*
	* <p>Note: System services obtained via this API may be closely associated with		* <p>Note: System services obtained via this API may be closely associated with
	@@ -2733,6 +2737,8 @@ public abstract class Context {
	* @see android.app.job.JobScheduler		* @see android.app.job.JobScheduler
	* @see #NETWORK_STATS_SERVICE		* @see #NETWORK_STATS_SERVICE
	* @see android.app.usage.NetworkStatsManager		* @see android.app.usage.NetworkStatsManager
			* @see android.os.HardwarePropertiesManager
			* @see #HARDWARE_PROPERTIES_SERVICE
	*/		*/
	public abstract Object getSystemService(@ServiceName @NonNull String name);		public abstract Object getSystemService(@ServiceName @NonNull String name);

	@@ -3474,6 +3480,14 @@ public abstract class Context {
	*/		*/
	public static final String RADIO_SERVICE = "radio";		public static final String RADIO_SERVICE = "radio";

			/**
			* Use with {@link #getSystemService} to retrieve a
			* {@link android.os.HardwarePropertiesManager} for accessing the hardware properties service.
			*
			* @see #getSystemService
			*/
			public static final String HARDWARE_PROPERTIES_SERVICE = "hardwareproperties";

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