Snap for 7274915 from 66915840539c1e0f82f440ef74cdf78cfeba00ec to sc-release (bd33c1d7) · Commits · e / os / android_frameworks_base

core/api/current.txt

+13 −1

Original line number	Diff line number	Diff line
		@@ -7399,7 +7399,7 @@ package android.app.admin {
		field public static final String EXTRA_PROVISIONING_LOGO_URI = "android.app.extra.PROVISIONING_LOGO_URI";
		field @Deprecated public static final String EXTRA_PROVISIONING_MAIN_COLOR = "android.app.extra.PROVISIONING_MAIN_COLOR";
		field public static final String EXTRA_PROVISIONING_MODE = "android.app.extra.PROVISIONING_MODE";
		field public static final String EXTRA_PROVISIONING_PERMISSION_GRANT_OPT_OUT = "android.app.extra.PROVISIONING_PERMISSION_GRANT_OPT_OUT";
		field public static final String EXTRA_PROVISIONING_SENSORS_PERMISSION_GRANT_OPT_OUT = "android.app.extra.PROVISIONING_SENSORS_PERMISSION_GRANT_OPT_OUT";
		field public static final String EXTRA_PROVISIONING_SERIAL_NUMBER = "android.app.extra.PROVISIONING_SERIAL_NUMBER";
		field public static final String EXTRA_PROVISIONING_SKIP_EDUCATION_SCREENS = "android.app.extra.PROVISIONING_SKIP_EDUCATION_SCREENS";
		field public static final String EXTRA_PROVISIONING_SKIP_ENCRYPTION = "android.app.extra.PROVISIONING_SKIP_ENCRYPTION";
		@@ -10644,6 +10644,7 @@ package android.content {
		field public static final String NOTIFICATION_SERVICE = "notification";
		field public static final String NSD_SERVICE = "servicediscovery";
		field public static final String PEOPLE_SERVICE = "people";
		field public static final String PERFORMANCE_HINT_SERVICE = "performance_hint";
		field public static final String POWER_SERVICE = "power";
		field public static final String PRINT_SERVICE = "print";
		field public static final int RECEIVER_VISIBLE_TO_INSTANT_APPS = 1; // 0x1
		@@ -31559,6 +31560,17 @@ package android.os {
		field public static final int PATTERN_SUFFIX = 4; // 0x4
		}

		public final class PerformanceHintManager {
		method @Nullable public android.os.PerformanceHintManager.Session createHintSession(@NonNull int[], long);
		method public long getPreferredUpdateRateNanos();
		}

		public static class PerformanceHintManager.Session implements java.io.Closeable {
		method public void close();
		method public void reportActualWorkDuration(long);
		method public void updateTargetWorkDuration(long);
		}

		public final class PersistableBundle extends android.os.BaseBundle implements java.lang.Cloneable android.os.Parcelable {
		ctor public PersistableBundle();
		ctor public PersistableBundle(int);

core/java/android/app/SystemServiceRegistry.java

+13 −0

Original line number	Diff line number	Diff line
		@@ -158,12 +158,14 @@ import android.os.IBatteryPropertiesRegistrar;
		import android.os.IBinder;
		import android.os.IDumpstate;
		import android.os.IHardwarePropertiesManager;
		import android.os.IHintManager;
		import android.os.IPowerManager;
		import android.os.IRecoverySystem;
		import android.os.ISystemUpdateManager;
		import android.os.IThermalService;
		import android.os.IUserManager;
		import android.os.IncidentManager;
		import android.os.PerformanceHintManager;
		import android.os.PowerManager;
		import android.os.RecoverySystem;
		import android.os.ServiceManager;
		@@ -592,6 +594,17 @@ public final class SystemServiceRegistry {
		ctx.mMainThread.getHandler());
		}});

		registerService(Context.PERFORMANCE_HINT_SERVICE, PerformanceHintManager.class,
		new CachedServiceFetcher<PerformanceHintManager>() {
		@Override
		public PerformanceHintManager createService(ContextImpl ctx)
		throws ServiceNotFoundException {
		IBinder hintBinder = ServiceManager.getServiceOrThrow(
		Context.PERFORMANCE_HINT_SERVICE);
		IHintManager hintService = IHintManager.Stub.asInterface(hintBinder);
		return new PerformanceHintManager(hintService);
		}});

		registerService(Context.RECOVERY_SERVICE, RecoverySystem.class,
		new CachedServiceFetcher<RecoverySystem>() {
		@Override

core/java/android/app/admin/DevicePolicyManager.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -991,8 +991,8 @@ public class DevicePolicyManager {
		* <p>Use only for device owner provisioning.
		* @see #ACTION_GET_PROVISIONING_MODE
		*/
		public static final String EXTRA_PROVISIONING_PERMISSION_GRANT_OPT_OUT =
		"android.app.extra.PROVISIONING_PERMISSION_GRANT_OPT_OUT";
		public static final String EXTRA_PROVISIONING_SENSORS_PERMISSION_GRANT_OPT_OUT =
		"android.app.extra.PROVISIONING_SENSORS_PERMISSION_GRANT_OPT_OUT";

		/**
		* A String extra holding the URL-safe base64 encoded SHA-256 checksum of any signature of the
		@@ -10963,8 +10963,8 @@ public class DevicePolicyManager {
		* <p>
		* A device owner, by default, may continue granting these permissions. However, for increased
		* user control, the admin may opt out of controlling grants for these permissions by including
		* {@link #EXTRA_PROVISIONING_PERMISSION_GRANT_OPT_OUT} in the provisioning parameters. In that
		* case the device owner's control will be limited do denying these permissions.
		* {@link #EXTRA_PROVISIONING_SENSORS_PERMISSION_GRANT_OPT_OUT} in the provisioning parameters.
		* In that case the device owner's control will be limited do denying these permissions.
		* <p>
		* Attempts by the admin to grant these permissions, when the admin is restricted from doing
		* so, will be silently ignored (no exception will be thrown).

core/java/android/app/admin/FullyManagedDeviceProvisioningParams.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -229,7 +229,7 @@ public final class FullyManagedDeviceProvisioningParams implements Parcelable {

		/**
		* Marks that the Device Owner may grant permissions related to device sensors.
		* See {@link DevicePolicyManager#EXTRA_PROVISIONING_PERMISSION_GRANT_OPT_OUT}.
		* See {@link DevicePolicyManager#EXTRA_PROVISIONING_SENSORS_PERMISSION_GRANT_OPT_OUT}.
		*/
		@NonNull
		@SuppressLint("MissingGetterMatchingBuilder")

core/java/android/content/Context.java

+8 −0

Original line number	Diff line number	Diff line
		@@ -5224,6 +5224,14 @@ public abstract class Context {
		*/
		public static final String THERMAL_SERVICE = "thermalservice";

		/**
		* Use with {@link #getSystemService(String)} to retrieve a
		* {@link android.os.PerformanceHintManager} for accessing the performance hinting service.
		*
		* @see #getSystemService(String)
		*/
		public static final String PERFORMANCE_HINT_SERVICE = "performance_hint";

		/**
		* Use with {@link #getSystemService(String)} to retrieve a
		* {@link android.content.pm.ShortcutManager} for accessing the launcher shortcut service.