Merge "Introduce BATTERY_PREDICTION permission." into sc-dev am: be9701bfeb (554590be) · Commits · e / os / android_frameworks_base

core/api/system-current.txt

+2 −1

core/java/android/os/PowerManager.java

+6 −2

Original line number	Original line	Diff line number	Diff line
	@@ -1898,7 +1898,8 @@ public final class PowerManager {
	* These estimates will be displayed on system UI surfaces in place of the system computed		* These estimates will be displayed on system UI surfaces in place of the system computed
	* value.		* value.
	*		*
	* Calling this requires the {@link android.Manifest.permission#DEVICE_POWER} permission.		* Calling this requires either the {@link android.Manifest.permission#DEVICE_POWER} or the
			* {@link android.Manifest.permission#BATTERY_PREDICTION} permissions.
	*		*
	* @param timeRemaining The time remaining as a {@link Duration}.		* @param timeRemaining The time remaining as a {@link Duration}.
	* @param isPersonalized true if personalized based on device usage history, false otherwise.		* @param isPersonalized true if personalized based on device usage history, false otherwise.
	@@ -1906,7 +1907,10 @@ public final class PowerManager {
	* @hide		* @hide
	*/		*/
	@SystemApi		@SystemApi
	@RequiresPermission(android.Manifest.permission.DEVICE_POWER)		@RequiresPermission(anyOf = {
			android.Manifest.permission.BATTERY_PREDICTION,
			android.Manifest.permission.DEVICE_POWER
			})
	public void setBatteryDischargePrediction(@NonNull Duration timeRemaining,		public void setBatteryDischargePrediction(@NonNull Duration timeRemaining,
	boolean isPersonalized) {		boolean isPersonalized) {
	if (timeRemaining == null) {		if (timeRemaining == null) {

core/res/AndroidManifest.xml

+6 −0

Original line number	Original line	Diff line number	Diff line
	@@ -4377,6 +4377,12 @@
	<permission android:name="android.permission.POWER_SAVER"		<permission android:name="android.permission.POWER_SAVER"
	android:protectionLevel="signature\|privileged" />		android:protectionLevel="signature\|privileged" />

			<!-- Allows providing the system with battery predictions.
			Superseded by DEVICE_POWER permission. @hide @SystemApi
			-->
			<permission android:name="android.permission.BATTERY_PREDICTION"
			android:protectionLevel="signature\|privileged" />

	<!-- Allows access to the PowerManager.userActivity function.		<!-- Allows access to the PowerManager.userActivity function.
	<p>Not for use by third-party applications. @hide @SystemApi -->		<p>Not for use by third-party applications. @hide @SystemApi -->
	<permission android:name="android.permission.USER_ACTIVITY"		<permission android:name="android.permission.USER_ACTIVITY"

data/etc/privapp-permissions-platform.xml

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -316,6 +316,8 @@ applications that come with the platform
	<permission name="android.permission.MODIFY_DAY_NIGHT_MODE"/>		<permission name="android.permission.MODIFY_DAY_NIGHT_MODE"/>
	<permission name="android.permission.ACCESS_LOWPAN_STATE"/>		<permission name="android.permission.ACCESS_LOWPAN_STATE"/>
	<permission name="android.permission.BACKUP"/>		<permission name="android.permission.BACKUP"/>
			<!-- Needed for test only -->
			<permission name="android.permission.BATTERY_PREDICTION"/>
	<permission name="android.permission.BATTERY_STATS"/>		<permission name="android.permission.BATTERY_STATS"/>
	<permission name="android.permission.BIND_APPWIDGET"/>		<permission name="android.permission.BIND_APPWIDGET"/>
	<permission name="android.permission.CHANGE_APP_IDLE_STATE"/>		<permission name="android.permission.CHANGE_APP_IDLE_STATE"/>

packages/Shell/AndroidManifest.xml

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -100,6 +100,7 @@
	<uses-permission android:name="android.permission.REBOOT" />		<uses-permission android:name="android.permission.REBOOT" />
	<uses-permission android:name="android.permission.DEVICE_POWER" />		<uses-permission android:name="android.permission.DEVICE_POWER" />
	<uses-permission android:name="android.permission.POWER_SAVER" />		<uses-permission android:name="android.permission.POWER_SAVER" />
			<uses-permission android:name="android.permission.BATTERY_PREDICTION" />
	<uses-permission android:name="android.permission.INSTALL_LOCATION_PROVIDER" />		<uses-permission android:name="android.permission.INSTALL_LOCATION_PROVIDER" />
	<uses-permission android:name="android.permission.BACKUP" />		<uses-permission android:name="android.permission.BACKUP" />
	<uses-permission android:name="android.permission.FORCE_STOP_PACKAGES" />		<uses-permission android:name="android.permission.FORCE_STOP_PACKAGES" />

Original line number	Original line	Diff line number	Diff line
	@@ -27,6 +27,7 @@ package android {
	field public static final String AMBIENT_WALLPAPER = "android.permission.AMBIENT_WALLPAPER";		field public static final String AMBIENT_WALLPAPER = "android.permission.AMBIENT_WALLPAPER";
	field public static final String APPROVE_INCIDENT_REPORTS = "android.permission.APPROVE_INCIDENT_REPORTS";		field public static final String APPROVE_INCIDENT_REPORTS = "android.permission.APPROVE_INCIDENT_REPORTS";
	field public static final String BACKUP = "android.permission.BACKUP";		field public static final String BACKUP = "android.permission.BACKUP";
			field public static final String BATTERY_PREDICTION = "android.permission.BATTERY_PREDICTION";
	field public static final String BIND_ATTENTION_SERVICE = "android.permission.BIND_ATTENTION_SERVICE";		field public static final String BIND_ATTENTION_SERVICE = "android.permission.BIND_ATTENTION_SERVICE";
	field public static final String BIND_AUGMENTED_AUTOFILL_SERVICE = "android.permission.BIND_AUGMENTED_AUTOFILL_SERVICE";		field public static final String BIND_AUGMENTED_AUTOFILL_SERVICE = "android.permission.BIND_AUGMENTED_AUTOFILL_SERVICE";
	field public static final String BIND_CELL_BROADCAST_SERVICE = "android.permission.BIND_CELL_BROADCAST_SERVICE";		field public static final String BIND_CELL_BROADCAST_SERVICE = "android.permission.BIND_CELL_BROADCAST_SERVICE";
	@@ -8566,7 +8567,7 @@ package android.os {
	method @RequiresPermission(android.Manifest.permission.READ_DREAM_STATE) public boolean isAmbientDisplaySuppressedForToken(@NonNull String);		method @RequiresPermission(android.Manifest.permission.READ_DREAM_STATE) public boolean isAmbientDisplaySuppressedForToken(@NonNull String);
	method @RequiresPermission(anyOf={android.Manifest.permission.DEVICE_POWER, android.Manifest.permission.POWER_SAVER}) public boolean setAdaptivePowerSaveEnabled(boolean);		method @RequiresPermission(anyOf={android.Manifest.permission.DEVICE_POWER, android.Manifest.permission.POWER_SAVER}) public boolean setAdaptivePowerSaveEnabled(boolean);
	method @RequiresPermission(anyOf={android.Manifest.permission.DEVICE_POWER, android.Manifest.permission.POWER_SAVER}) public boolean setAdaptivePowerSavePolicy(@NonNull android.os.BatterySaverPolicyConfig);		method @RequiresPermission(anyOf={android.Manifest.permission.DEVICE_POWER, android.Manifest.permission.POWER_SAVER}) public boolean setAdaptivePowerSavePolicy(@NonNull android.os.BatterySaverPolicyConfig);
	method @RequiresPermission(android.Manifest.permission.DEVICE_POWER) public void setBatteryDischargePrediction(@NonNull java.time.Duration, boolean);		method @RequiresPermission(anyOf={android.Manifest.permission.BATTERY_PREDICTION, android.Manifest.permission.DEVICE_POWER}) public void setBatteryDischargePrediction(@NonNull java.time.Duration, boolean);
	method @RequiresPermission(android.Manifest.permission.POWER_SAVER) public boolean setDynamicPowerSaveHint(boolean, int);		method @RequiresPermission(android.Manifest.permission.POWER_SAVER) public boolean setDynamicPowerSaveHint(boolean, int);
	method @RequiresPermission(anyOf={android.Manifest.permission.DEVICE_POWER, android.Manifest.permission.POWER_SAVER}) public boolean setFullPowerSavePolicy(@NonNull android.os.BatterySaverPolicyConfig);		method @RequiresPermission(anyOf={android.Manifest.permission.DEVICE_POWER, android.Manifest.permission.POWER_SAVER}) public boolean setFullPowerSavePolicy(@NonNull android.os.BatterySaverPolicyConfig);
	method @RequiresPermission(anyOf={android.Manifest.permission.DEVICE_POWER, android.Manifest.permission.POWER_SAVER}) public boolean setPowerSaveModeEnabled(boolean);		method @RequiresPermission(anyOf={android.Manifest.permission.DEVICE_POWER, android.Manifest.permission.POWER_SAVER}) public boolean setPowerSaveModeEnabled(boolean);