Merge changes from topic "retailDemo" into tm-dev (ae758aa7) · Commits · e / os / android_frameworks_base

core/api/system-current.txt

+4 −1

Original line number	Diff line number	Diff line
		@@ -234,6 +234,7 @@ package android {
		field public static final String POWER_SAVER = "android.permission.POWER_SAVER";
		field public static final String PROVIDE_RESOLVER_RANKER_SERVICE = "android.permission.PROVIDE_RESOLVER_RANKER_SERVICE";
		field public static final String PROVIDE_TRUST_AGENT = "android.permission.PROVIDE_TRUST_AGENT";
		field public static final String PROVISION_DEMO_DEVICE = "android.permission.PROVISION_DEMO_DEVICE";
		field public static final String QUERY_ADMIN_POLICY = "android.permission.QUERY_ADMIN_POLICY";
		field public static final String QUERY_TIME_ZONE_RULES = "android.permission.QUERY_TIME_ZONE_RULES";
		field public static final String QUERY_USERS = "android.permission.QUERY_USERS";
		@@ -1101,7 +1102,7 @@ package android.app.admin {
		method @RequiresPermission("android.permission.NOTIFY_PENDING_SYSTEM_UPDATE") public void notifyPendingSystemUpdate(long);
		method @RequiresPermission("android.permission.NOTIFY_PENDING_SYSTEM_UPDATE") public void notifyPendingSystemUpdate(long, boolean);
		method @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS_FULL) public boolean packageHasActiveAdmins(String);
		method @RequiresPermission(android.Manifest.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS) public void provisionFullyManagedDevice(@NonNull android.app.admin.FullyManagedDeviceProvisioningParams) throws android.app.admin.ProvisioningException;
		method @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS, android.Manifest.permission.PROVISION_DEMO_DEVICE}) public void provisionFullyManagedDevice(@NonNull android.app.admin.FullyManagedDeviceProvisioningParams) throws android.app.admin.ProvisioningException;
		method @RequiresPermission(android.Manifest.permission.UPDATE_DEVICE_MANAGEMENT_RESOURCES) public void resetDrawables(@NonNull String[]);
		method @RequiresPermission(android.Manifest.permission.UPDATE_DEVICE_MANAGEMENT_RESOURCES) public void resetStrings(@NonNull String[]);
		method @RequiresPermission(android.Manifest.permission.SEND_LOST_MODE_LOCATION_UPDATES) public void sendLostModeLocationUpdate(@NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.lang.Boolean>);
		@@ -1254,6 +1255,7 @@ package android.app.admin {
		method @Nullable public java.util.Locale getLocale();
		method @NonNull public String getOwnerName();
		method @Nullable public String getTimeZone();
		method public boolean isDemoDevice();
		method public boolean isLeaveAllSystemAppsEnabled();
		method public void writeToParcel(@NonNull android.os.Parcel, @Nullable int);
		field @NonNull public static final android.os.Parcelable.Creator<android.app.admin.FullyManagedDeviceProvisioningParams> CREATOR;
		@@ -1264,6 +1266,7 @@ package android.app.admin {
		method @NonNull public android.app.admin.FullyManagedDeviceProvisioningParams build();
		method @NonNull public android.app.admin.FullyManagedDeviceProvisioningParams.Builder setAdminExtras(@NonNull android.os.PersistableBundle);
		method @NonNull public android.app.admin.FullyManagedDeviceProvisioningParams.Builder setCanDeviceOwnerGrantSensorsPermissions(boolean);
		method @NonNull public android.app.admin.FullyManagedDeviceProvisioningParams.Builder setDemoDevice(boolean);
		method @NonNull public android.app.admin.FullyManagedDeviceProvisioningParams.Builder setLeaveAllSystemAppsEnabled(boolean);
		method @NonNull public android.app.admin.FullyManagedDeviceProvisioningParams.Builder setLocalTime(long);
		method @NonNull public android.app.admin.FullyManagedDeviceProvisioningParams.Builder setLocale(@Nullable java.util.Locale);

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

+6 −3

Original line number	Diff line number	Diff line
		@@ -14776,17 +14776,20 @@ public class DevicePolicyManager {
		* <p>The method {@link #checkProvisioningPrecondition} must be returning {@link #STATUS_OK}
		* before calling this method.
		*
		* <p>Holders of {@link android.Manifest.permission#PROVISION_DEMO_DEVICE} can call this API
		* only if {@link FullyManagedDeviceProvisioningParams#isDemoDevice()} is {@code true}.</p>
		*
		* @param provisioningParams Params required to provision a fully managed device,
		* see {@link FullyManagedDeviceProvisioningParams}.
		*
		* @throws SecurityException if the caller does not hold
		* {@link android.Manifest.permission#MANAGE_PROFILE_AND_DEVICE_OWNERS}.
		* @throws ProvisioningException if an error occurred during provisioning.
		*
		* @hide
		*/
		@SystemApi
		@RequiresPermission(android.Manifest.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS)
		@RequiresPermission(anyOf = {
		android.Manifest.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS,
		android.Manifest.permission.PROVISION_DEMO_DEVICE})
		public void provisionFullyManagedDevice(
		@NonNull FullyManagedDeviceProvisioningParams provisioningParams)
		throws ProvisioningException {

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

+40 −5

Original line number	Diff line number	Diff line
		@@ -26,6 +26,7 @@ import android.content.ComponentName;
		import android.os.Parcel;
		import android.os.Parcelable;
		import android.os.PersistableBundle;
		import android.provider.Settings;
		import android.stats.devicepolicy.DevicePolicyEnums;

		import java.util.Locale;
		@@ -44,6 +45,7 @@ public final class FullyManagedDeviceProvisioningParams implements Parcelable {
		"CAN_DEVICE_OWNER_GRANT_SENSOR_PERMISSIONS";
		private static final String TIME_ZONE_PROVIDED_PARAM = "TIME_ZONE_PROVIDED";
		private static final String LOCALE_PROVIDED_PARAM = "LOCALE_PROVIDED";
		private static final String DEMO_DEVICE = "DEMO_DEVICE";

		@NonNull private final ComponentName mDeviceAdminComponentName;
		@NonNull private final String mOwnerName;
		@@ -54,6 +56,8 @@ public final class FullyManagedDeviceProvisioningParams implements Parcelable {
		@Nullable private final Locale mLocale;
		private final boolean mDeviceOwnerCanGrantSensorsPermissions;
		@NonNull private final PersistableBundle mAdminExtras;
		private final boolean mDemoDevice;


		private FullyManagedDeviceProvisioningParams(
		@NonNull ComponentName deviceAdminComponentName,
		@@ -63,7 +67,8 @@ public final class FullyManagedDeviceProvisioningParams implements Parcelable {
		long localTime,
		@Nullable @SuppressLint("UseIcu") Locale locale,
		boolean deviceOwnerCanGrantSensorsPermissions,
		@NonNull PersistableBundle adminExtras) {
		@NonNull PersistableBundle adminExtras,
		boolean demoDevice) {
		this.mDeviceAdminComponentName = requireNonNull(deviceAdminComponentName);
		this.mOwnerName = requireNonNull(ownerName);
		this.mLeaveAllSystemAppsEnabled = leaveAllSystemAppsEnabled;
		@@ -73,6 +78,7 @@ public final class FullyManagedDeviceProvisioningParams implements Parcelable {
		this.mDeviceOwnerCanGrantSensorsPermissions =
		deviceOwnerCanGrantSensorsPermissions;
		this.mAdminExtras = adminExtras;
		this.mDemoDevice = demoDevice;
		}

		private FullyManagedDeviceProvisioningParams(
		@@ -83,7 +89,8 @@ public final class FullyManagedDeviceProvisioningParams implements Parcelable {
		long localTime,
		@Nullable String localeStr,
		boolean deviceOwnerCanGrantSensorsPermissions,
		@Nullable PersistableBundle adminExtras) {
		@Nullable PersistableBundle adminExtras,
		boolean demoDevice) {
		this(deviceAdminComponentName,
		ownerName,
		leaveAllSystemAppsEnabled,
		@@ -91,7 +98,8 @@ public final class FullyManagedDeviceProvisioningParams implements Parcelable {
		localTime,
		getLocale(localeStr),
		deviceOwnerCanGrantSensorsPermissions,
		adminExtras);
		adminExtras,
		demoDevice);
		}

		@Nullable
		@@ -165,6 +173,14 @@ public final class FullyManagedDeviceProvisioningParams implements Parcelable {
		return new PersistableBundle(mAdminExtras);
		}

		/**
		* @return true if this device is being setup as a retail demo device, see
		* {@link Settings.Global#DEVICE_DEMO_MODE}.
		*/
		public boolean isDemoDevice() {
		return mDemoDevice;
		}

		/**
		* Logs the provisioning params using {@link DevicePolicyEventLogger}.
		*
		@@ -178,6 +194,7 @@ public final class FullyManagedDeviceProvisioningParams implements Parcelable {
		mDeviceOwnerCanGrantSensorsPermissions);
		logParam(callerPackage, TIME_ZONE_PROVIDED_PARAM, /* value= */ mTimeZone != null);
		logParam(callerPackage, LOCALE_PROVIDED_PARAM, /* value= */ mLocale != null);
		logParam(callerPackage, DEMO_DEVICE, mDemoDevice);
		}

		private void logParam(String callerPackage, String param, boolean value) {
		@@ -204,6 +221,9 @@ public final class FullyManagedDeviceProvisioningParams implements Parcelable {
		// Default to allowing control over sensor permission grants.
		boolean mDeviceOwnerCanGrantSensorsPermissions = true;
		@NonNull private PersistableBundle mAdminExtras;
		// Default is normal user devices
		boolean mDemoDevice = false;


		/**
		* Initialize a new {@link Builder} to construct a
		@@ -288,6 +308,16 @@ public final class FullyManagedDeviceProvisioningParams implements Parcelable {
		return this;
		}

		/**
		* Marks the device as a demo device, see {@link Settings.Global#DEVICE_DEMO_MODE}. The
		* default value if unset is {@code false}.
		*/
		@NonNull
		public Builder setDemoDevice(boolean demoDevice) {
		this.mDemoDevice = demoDevice;
		return this;
		}

		/**
		* Combines all of the attributes that have been set on this {@code Builder}
		*
		@@ -303,7 +333,8 @@ public final class FullyManagedDeviceProvisioningParams implements Parcelable {
		mLocalTime,
		mLocale,
		mDeviceOwnerCanGrantSensorsPermissions,
		mAdminExtras);
		mAdminExtras,
		mDemoDevice);
		}
		}

		@@ -327,6 +358,7 @@ public final class FullyManagedDeviceProvisioningParams implements Parcelable {
		+ ", mDeviceOwnerCanGrantSensorsPermissions="
		+ mDeviceOwnerCanGrantSensorsPermissions
		+ ", mAdminExtras=" + mAdminExtras
		+ ", mDemoDevice=" + mDemoDevice
		+ '}';
		}

		@@ -340,6 +372,7 @@ public final class FullyManagedDeviceProvisioningParams implements Parcelable {
		dest.writeString(mLocale == null ? null : mLocale.toLanguageTag());
		dest.writeBoolean(mDeviceOwnerCanGrantSensorsPermissions);
		dest.writePersistableBundle(mAdminExtras);
		dest.writeBoolean(mDemoDevice);
		}

		@NonNull
		@@ -355,6 +388,7 @@ public final class FullyManagedDeviceProvisioningParams implements Parcelable {
		String locale = in.readString();
		boolean deviceOwnerCanGrantSensorsPermissions = in.readBoolean();
		PersistableBundle adminExtras = in.readPersistableBundle();
		boolean demoDevice = in.readBoolean();

		return new FullyManagedDeviceProvisioningParams(
		componentName,
		@@ -364,7 +398,8 @@ public final class FullyManagedDeviceProvisioningParams implements Parcelable {
		localtime,
		locale,
		deviceOwnerCanGrantSensorsPermissions,
		adminExtras);
		adminExtras,
		demoDevice);
		}

		@Override

core/res/AndroidManifest.xml

+5 −1

Original line number	Diff line number	Diff line
		@@ -2937,7 +2937,7 @@
		<!-- @SystemApi @hide Allows an application to set the profile owners and the device owner.
		This permission is not available to third party applications.-->
		<permission android:name="android.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS"
		android:protectionLevel="signature\|role\|setup"
		android:protectionLevel="signature\|role"
		android:label="@string/permlab_manageProfileAndDeviceOwners"
		android:description="@string/permdesc_manageProfileAndDeviceOwners" />

		@@ -2946,6 +2946,10 @@
		<permission android:name="android.permission.QUERY_ADMIN_POLICY"
		android:protectionLevel="signature\|role" />

		<!-- @SystemApi @hide Allows an application to set a device owner on retail demo devices.-->
		<permission android:name="android.permission.PROVISION_DEMO_DEVICE"
		android:protectionLevel="signature\|setup" />

		<!-- @TestApi @hide Allows an application to reset the record of previous system update freeze
		periods. -->
		<permission android:name="android.permission.CLEAR_FREEZE_PERIOD"

packages/Shell/AndroidManifest.xml

+1 −0

Original line number	Diff line number	Diff line
		@@ -210,6 +210,7 @@
		<uses-permission android:name="android.permission.MANAGE_CREDENTIAL_MANAGEMENT_APP" />
		<uses-permission android:name="android.permission.MANAGE_DEVICE_ADMINS" />
		<uses-permission android:name="android.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS" />
		<uses-permission android:name="android.permission.PROVISION_DEMO_DEVICE" />
		<uses-permission android:name="android.permission.QUERY_ADMIN_POLICY" />
		<uses-permission android:name="android.permission.UPDATE_DEVICE_MANAGEMENT_RESOURCES" />
		<uses-permission android:name="android.permission.FORCE_DEVICE_POLICY_MANAGER_LOGS" />