Merge changes from topic "cherrypicker-L96900000953714853:N25700001248135378" (2ca56df0) · Commits · e / os / android_frameworks_base

core/api/current.txt

+10 −30

Original line number	Original line	Diff line number	Diff line
	@@ -7418,12 +7418,6 @@ package android.app.admin {
	method @NonNull public java.util.List<java.lang.String> getDelegatedScopes(@Nullable android.content.ComponentName, @NonNull String);		method @NonNull public java.util.List<java.lang.String> getDelegatedScopes(@Nullable android.content.ComponentName, @NonNull String);
	method public CharSequence getDeviceOwnerLockScreenInfo();		method public CharSequence getDeviceOwnerLockScreenInfo();
	method @Nullable public String getDevicePolicyManagementRoleHolderPackage();		method @Nullable public String getDevicePolicyManagementRoleHolderPackage();
	method @Nullable public android.graphics.drawable.Drawable getDrawable(@NonNull String, @NonNull String, @NonNull java.util.function.Supplier<android.graphics.drawable.Drawable>);
	method @Nullable public android.graphics.drawable.Drawable getDrawable(@NonNull String, @NonNull String, @NonNull String, @NonNull java.util.function.Supplier<android.graphics.drawable.Drawable>);
	method @Nullable public android.graphics.drawable.Icon getDrawableAsIcon(@NonNull String, @NonNull String, @NonNull String, @Nullable android.graphics.drawable.Icon);
	method @Nullable public android.graphics.drawable.Icon getDrawableAsIcon(@NonNull String, @NonNull String, @Nullable android.graphics.drawable.Icon);
	method @Nullable public android.graphics.drawable.Drawable getDrawableForDensity(@NonNull String, @NonNull String, int, @NonNull java.util.function.Supplier<android.graphics.drawable.Drawable>);
	method @Nullable public android.graphics.drawable.Drawable getDrawableForDensity(@NonNull String, @NonNull String, @NonNull String, int, @NonNull java.util.function.Supplier<android.graphics.drawable.Drawable>);
	method public CharSequence getEndUserSessionMessage(@NonNull android.content.ComponentName);		method public CharSequence getEndUserSessionMessage(@NonNull android.content.ComponentName);
	method @NonNull public String getEnrollmentSpecificId();		method @NonNull public String getEnrollmentSpecificId();
	method @Nullable public android.app.admin.FactoryResetProtectionPolicy getFactoryResetProtectionPolicy(@Nullable android.content.ComponentName);		method @Nullable public android.app.admin.FactoryResetProtectionPolicy getFactoryResetProtectionPolicy(@Nullable android.content.ComponentName);
	@@ -7470,14 +7464,13 @@ package android.app.admin {
	method @NonNull public java.util.List<android.app.admin.PreferentialNetworkServiceConfig> getPreferentialNetworkServiceConfigs();		method @NonNull public java.util.List<android.app.admin.PreferentialNetworkServiceConfig> getPreferentialNetworkServiceConfigs();
	method public int getRequiredPasswordComplexity();		method public int getRequiredPasswordComplexity();
	method public long getRequiredStrongAuthTimeout(@Nullable android.content.ComponentName);		method public long getRequiredStrongAuthTimeout(@Nullable android.content.ComponentName);
			method @NonNull public android.app.admin.DevicePolicyResourcesManager getResources();
	method public boolean getScreenCaptureDisabled(@Nullable android.content.ComponentName);		method public boolean getScreenCaptureDisabled(@Nullable android.content.ComponentName);
	method public java.util.List<android.os.UserHandle> getSecondaryUsers(@NonNull android.content.ComponentName);		method public java.util.List<android.os.UserHandle> getSecondaryUsers(@NonNull android.content.ComponentName);
	method public CharSequence getShortSupportMessage(@NonNull android.content.ComponentName);		method public CharSequence getShortSupportMessage(@NonNull android.content.ComponentName);
	method public CharSequence getStartUserSessionMessage(@NonNull android.content.ComponentName);		method public CharSequence getStartUserSessionMessage(@NonNull android.content.ComponentName);
	method @Deprecated public boolean getStorageEncryption(@Nullable android.content.ComponentName);		method @Deprecated public boolean getStorageEncryption(@Nullable android.content.ComponentName);
	method public int getStorageEncryptionStatus();		method public int getStorageEncryptionStatus();
	method @Nullable public String getString(@NonNull String, @NonNull java.util.function.Supplier<java.lang.String>);
	method @Nullable public String getString(@NonNull String, @NonNull java.util.function.Supplier<java.lang.String>, @NonNull java.lang.Object...);
	method @Nullable public android.app.admin.SystemUpdatePolicy getSystemUpdatePolicy();		method @Nullable public android.app.admin.SystemUpdatePolicy getSystemUpdatePolicy();
	method @Nullable public android.os.PersistableBundle getTransferOwnershipBundle();		method @Nullable public android.os.PersistableBundle getTransferOwnershipBundle();
	method @Nullable public java.util.List<android.os.PersistableBundle> getTrustAgentConfiguration(@Nullable android.content.ComponentName, @NonNull android.content.ComponentName);		method @Nullable public java.util.List<android.os.PersistableBundle> getTrustAgentConfiguration(@Nullable android.content.ComponentName, @NonNull android.content.ComponentName);
	@@ -7839,31 +7832,18 @@ package android.app.admin {
	}		}

	public final class DevicePolicyResources {		public final class DevicePolicyResources {
	}

	public static final class DevicePolicyResources.Drawables {
	field public static final String UNDEFINED = "UNDEFINED";
	field public static final String WORK_PROFILE_ICON = "WORK_PROFILE_ICON";
	field public static final String WORK_PROFILE_ICON_BADGE = "WORK_PROFILE_ICON_BADGE";
	field public static final String WORK_PROFILE_OFF_ICON = "WORK_PROFILE_OFF_ICON";
	field public static final String WORK_PROFILE_USER_ICON = "WORK_PROFILE_USER_ICON";
	}

	public static final class DevicePolicyResources.Drawables.Source {
	field public static final String HOME_WIDGET = "HOME_WIDGET";
	field public static final String LAUNCHER_OFF_BUTTON = "LAUNCHER_OFF_BUTTON";
	field public static final String NOTIFICATION = "NOTIFICATION";
	field public static final String PROFILE_SWITCH_ANIMATION = "PROFILE_SWITCH_ANIMATION";
	field public static final String QUICK_SETTINGS = "QUICK_SETTINGS";
	field public static final String STATUS_BAR = "STATUS_BAR";
	field public static final String UNDEFINED = "UNDEFINED";		field public static final String UNDEFINED = "UNDEFINED";
	}		}

	public static final class DevicePolicyResources.Drawables.Style {		public class DevicePolicyResourcesManager {
	field public static final String DEFAULT = "DEFAULT";		method @Nullable public android.graphics.drawable.Drawable getDrawable(@NonNull String, @NonNull String, @NonNull java.util.function.Supplier<android.graphics.drawable.Drawable>);
	field public static final String OUTLINE = "OUTLINE";		method @Nullable public android.graphics.drawable.Drawable getDrawable(@NonNull String, @NonNull String, @NonNull String, @NonNull java.util.function.Supplier<android.graphics.drawable.Drawable>);
	field public static final String SOLID_COLORED = "SOLID_COLORED";		method @Nullable public android.graphics.drawable.Icon getDrawableAsIcon(@NonNull String, @NonNull String, @NonNull String, @Nullable android.graphics.drawable.Icon);
	field public static final String SOLID_NOT_COLORED = "SOLID_NOT_COLORED";		method @Nullable public android.graphics.drawable.Icon getDrawableAsIcon(@NonNull String, @NonNull String, @Nullable android.graphics.drawable.Icon);
			method @Nullable public android.graphics.drawable.Drawable getDrawableForDensity(@NonNull String, @NonNull String, int, @NonNull java.util.function.Supplier<android.graphics.drawable.Drawable>);
			method @Nullable public android.graphics.drawable.Drawable getDrawableForDensity(@NonNull String, @NonNull String, @NonNull String, int, @NonNull java.util.function.Supplier<android.graphics.drawable.Drawable>);
			method @Nullable public String getString(@NonNull String, @NonNull java.util.function.Supplier<java.lang.String>);
			method @Nullable public String getString(@NonNull String, @NonNull java.util.function.Supplier<java.lang.String>, @NonNull java.lang.Object...);
	}		}

	public final class DnsEvent extends android.app.admin.NetworkEvent implements android.os.Parcelable {		public final class DnsEvent extends android.app.admin.NetworkEvent implements android.os.Parcelable {

core/api/system-current.txt

+7 −41

Original line number	Original line	Diff line number	Diff line
	@@ -1109,16 +1109,12 @@ package android.app.admin {
	method @RequiresPermission("android.permission.NOTIFY_PENDING_SYSTEM_UPDATE") public void notifyPendingSystemUpdate(long, boolean);		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.INTERACT_ACROSS_USERS_FULL) public boolean packageHasActiveAdmins(String);
	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(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 java.util.Set<java.lang.String>);
	method @RequiresPermission(android.Manifest.permission.UPDATE_DEVICE_MANAGEMENT_RESOURCES) public void resetStrings(@NonNull java.util.Set<java.lang.String>);
	method @RequiresPermission(android.Manifest.permission.TRIGGER_LOST_MODE) public void sendLostModeLocationUpdate(@NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.lang.Boolean>);		method @RequiresPermission(android.Manifest.permission.TRIGGER_LOST_MODE) public void sendLostModeLocationUpdate(@NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.lang.Boolean>);
	method @Deprecated @RequiresPermission(android.Manifest.permission.MANAGE_DEVICE_ADMINS) public boolean setActiveProfileOwner(@NonNull android.content.ComponentName, String) throws java.lang.IllegalArgumentException;		method @Deprecated @RequiresPermission(android.Manifest.permission.MANAGE_DEVICE_ADMINS) public boolean setActiveProfileOwner(@NonNull android.content.ComponentName, String) throws java.lang.IllegalArgumentException;
	method @RequiresPermission(android.Manifest.permission.MANAGE_USERS) public void setDeviceProvisioningConfigApplied();		method @RequiresPermission(android.Manifest.permission.MANAGE_USERS) public void setDeviceProvisioningConfigApplied();
	method @RequiresPermission(android.Manifest.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS) public void setDpcDownloaded(boolean);		method @RequiresPermission(android.Manifest.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS) public void setDpcDownloaded(boolean);
	method @RequiresPermission(android.Manifest.permission.UPDATE_DEVICE_MANAGEMENT_RESOURCES) public void setDrawables(@NonNull java.util.Set<android.app.admin.DevicePolicyDrawableResource>);
	method @Deprecated @RequiresPermission(value=android.Manifest.permission.GRANT_PROFILE_OWNER_DEVICE_IDS_ACCESS, conditional=true) public void setProfileOwnerCanAccessDeviceIds(@NonNull android.content.ComponentName);		method @Deprecated @RequiresPermission(value=android.Manifest.permission.GRANT_PROFILE_OWNER_DEVICE_IDS_ACCESS, conditional=true) public void setProfileOwnerCanAccessDeviceIds(@NonNull android.content.ComponentName);
	method public void setSecondaryLockscreenEnabled(@NonNull android.content.ComponentName, boolean);		method public void setSecondaryLockscreenEnabled(@NonNull android.content.ComponentName, boolean);
	method @RequiresPermission(android.Manifest.permission.UPDATE_DEVICE_MANAGEMENT_RESOURCES) public void setStrings(@NonNull java.util.Set<android.app.admin.DevicePolicyStringResource>);
	method @RequiresPermission(android.Manifest.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS) public void setUserProvisioningState(int, @NonNull android.os.UserHandle);		method @RequiresPermission(android.Manifest.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS) public void setUserProvisioningState(int, @NonNull android.os.UserHandle);
	method @RequiresPermission(android.Manifest.permission.MANAGE_ROLE_HOLDERS) public boolean shouldAllowBypassingDevicePolicyManagementRoleQualification();		method @RequiresPermission(android.Manifest.permission.MANAGE_ROLE_HOLDERS) public boolean shouldAllowBypassingDevicePolicyManagementRoleQualification();
	field public static final String ACCOUNT_FEATURE_DEVICE_OR_PROFILE_OWNER_ALLOWED = "android.account.DEVICE_OR_PROFILE_OWNER_ALLOWED";		field public static final String ACCOUNT_FEATURE_DEVICE_OR_PROFILE_OWNER_ALLOWED = "android.account.DEVICE_OR_PROFILE_OWNER_ALLOWED";
	@@ -1198,43 +1194,6 @@ package android.app.admin {
	}		}

	public static final class DevicePolicyResources.Strings {		public static final class DevicePolicyResources.Strings {
	field public static final String UNDEFINED = "UNDEFINED";
	}

	public static final class DevicePolicyResources.Strings.Dialer {
	field public static final String NOTIFICATION_INCOMING_WORK_CALL_TITLE = "Dialer.NOTIFICATION_INCOMING_WORK_CALL_TITLE";
	field public static final String NOTIFICATION_MISSED_WORK_CALL_TITLE = "Dialer.NOTIFICATION_MISSED_WORK_CALL_TITLE";
	field public static final String NOTIFICATION_ONGOING_WORK_CALL_TITLE = "Dialer.NOTIFICATION_ONGOING_WORK_CALL_TITLE";
	field public static final String NOTIFICATION_WIFI_WORK_CALL_LABEL = "Dialer.NOTIFICATION_WIFI_WORK_CALL_LABEL";
	}

	public static final class DevicePolicyResources.Strings.DocumentsUi {
	field public static final String CANT_SAVE_TO_PERSONAL_MESSAGE = "DocumentsUi.CANT_SAVE_TO_PERSONAL_MESSAGE";
	field public static final String CANT_SAVE_TO_PERSONAL_TITLE = "DocumentsUi.CANT_SAVE_TO_PERSONAL_TITLE";
	field public static final String CANT_SAVE_TO_WORK_MESSAGE = "DocumentsUi.CANT_SAVE_TO_WORK_MESSAGE";
	field public static final String CANT_SAVE_TO_WORK_TITLE = "DocumentsUi.CANT_SAVE_TO_WORK_TITLE";
	field public static final String CANT_SELECT_PERSONAL_FILES_MESSAGE = "DocumentsUi.CANT_SELECT_PERSONAL_FILES_MESSAGE";
	field public static final String CANT_SELECT_PERSONAL_FILES_TITLE = "DocumentsUi.CANT_SELECT_PERSONAL_FILES_TITLE";
	field public static final String CANT_SELECT_WORK_FILES_MESSAGE = "DocumentsUi.CANT_SELECT_WORK_FILES_MESSAGE";
	field public static final String CANT_SELECT_WORK_FILES_TITLE = "DocumentsUi.CANT_SELECT_WORK_FILES_TITLE";
	field public static final String CROSS_PROFILE_NOT_ALLOWED_MESSAGE = "DocumentsUi.CROSS_PROFILE_NOT_ALLOWED_MESSAGE";
	field public static final String CROSS_PROFILE_NOT_ALLOWED_TITLE = "DocumentsUi.CROSS_PROFILE_NOT_ALLOWED_TITLE";
	field public static final String PERSONAL_TAB = "DocumentsUi.PERSONAL_TAB";
	field public static final String PREVIEW_WORK_FILE_ACCESSIBILITY = "DocumentsUi.PREVIEW_WORK_FILE_ACCESSIBILITY";
	field public static final String WORK_ACCESSIBILITY = "DocumentsUi.WORK_ACCESSIBILITY";
	field public static final String WORK_PROFILE_OFF_ENABLE_BUTTON = "DocumentsUi.WORK_PROFILE_OFF_ENABLE_BUTTON";
	field public static final String WORK_PROFILE_OFF_ERROR_TITLE = "DocumentsUi.WORK_PROFILE_OFF_ERROR_TITLE";
	field public static final String WORK_TAB = "DocumentsUi.WORK_TAB";
	}

	public static final class DevicePolicyResources.Strings.MediaProvider {
	field public static final String BLOCKED_BY_ADMIN_TITLE = "MediaProvider.BLOCKED_BY_ADMIN_TITLE";
	field public static final String BLOCKED_FROM_PERSONAL_MESSAGE = "MediaProvider.BLOCKED_FROM_PERSONAL_MESSAGE";
	field public static final String BLOCKED_FROM_WORK_MESSAGE = "MediaProvider.BLOCKED_FROM_WORK_MESSAGE";
	field public static final String SWITCH_TO_PERSONAL_MESSAGE = "MediaProvider.SWITCH_TO_PERSONAL_MESSAGE";
	field public static final String SWITCH_TO_WORK_MESSAGE = "MediaProvider.SWITCH_TO_WORK_MESSAGE";
	field public static final String WORK_PROFILE_PAUSED_MESSAGE = "MediaProvider.WORK_PROFILE_PAUSED_MESSAGE";
	field public static final String WORK_PROFILE_PAUSED_TITLE = "MediaProvider.WORK_PROFILE_PAUSED_TITLE";
	}		}

	public static final class DevicePolicyResources.Strings.PermissionController {		public static final class DevicePolicyResources.Strings.PermissionController {
	@@ -1246,6 +1205,13 @@ package android.app.admin {
	field public static final String WORK_PROFILE_DEFAULT_APPS_TITLE = "PermissionController.WORK_PROFILE_DEFAULT_APPS_TITLE";		field public static final String WORK_PROFILE_DEFAULT_APPS_TITLE = "PermissionController.WORK_PROFILE_DEFAULT_APPS_TITLE";
	}		}

			public class DevicePolicyResourcesManager {
			method @RequiresPermission(android.Manifest.permission.UPDATE_DEVICE_MANAGEMENT_RESOURCES) public void resetDrawables(@NonNull java.util.Set<java.lang.String>);
			method @RequiresPermission(android.Manifest.permission.UPDATE_DEVICE_MANAGEMENT_RESOURCES) public void resetStrings(@NonNull java.util.Set<java.lang.String>);
			method @RequiresPermission(android.Manifest.permission.UPDATE_DEVICE_MANAGEMENT_RESOURCES) public void setDrawables(@NonNull java.util.Set<android.app.admin.DevicePolicyDrawableResource>);
			method @RequiresPermission(android.Manifest.permission.UPDATE_DEVICE_MANAGEMENT_RESOURCES) public void setStrings(@NonNull java.util.Set<android.app.admin.DevicePolicyStringResource>);
			}

	public final class DevicePolicyStringResource implements android.os.Parcelable {		public final class DevicePolicyStringResource implements android.os.Parcelable {
	ctor public DevicePolicyStringResource(@NonNull android.content.Context, @NonNull String, @StringRes int);		ctor public DevicePolicyStringResource(@NonNull android.content.Context, @NonNull String, @StringRes int);
	method public int describeContents();		method public int describeContents();

core/java/android/app/admin/DevicePolicyDrawableResource.java

+15 −19

Original line number	Original line	Diff line number	Diff line
	@@ -20,7 +20,6 @@ import android.annotation.DrawableRes;
	import android.annotation.NonNull;		import android.annotation.NonNull;
	import android.annotation.Nullable;		import android.annotation.Nullable;
	import android.annotation.SystemApi;		import android.annotation.SystemApi;
	import android.app.admin.DevicePolicyResources.Drawables;
	import android.content.Context;		import android.content.Context;
	import android.os.Parcel;		import android.os.Parcel;
	import android.os.Parcelable;		import android.os.Parcelable;
	@@ -29,21 +28,21 @@ import java.util.Objects;

	/**		/**
	* Used to pass in the required information for updating an enterprise drawable resource using		* Used to pass in the required information for updating an enterprise drawable resource using
	* {@link DevicePolicyManager#setDrawables}.		* {@link DevicePolicyResourcesManager#setDrawables}.
	*		*
	* @hide		* @hide
	*/		*/
	@SystemApi		@SystemApi
	public final class DevicePolicyDrawableResource implements Parcelable {		public final class DevicePolicyDrawableResource implements Parcelable {
	@NonNull private final @DevicePolicyResources.UpdatableDrawableId String mDrawableId;		@NonNull private final String mDrawableId;
	@NonNull private final @DevicePolicyResources.UpdatableDrawableStyle String mDrawableStyle;		@NonNull private final String mDrawableStyle;
	@NonNull private final @DevicePolicyResources.UpdatableDrawableSource String mDrawableSource;		@NonNull private final String mDrawableSource;
	private final @DrawableRes int mResourceIdInCallingPackage;		private final @DrawableRes int mResourceIdInCallingPackage;
	@NonNull private ParcelableResource mResource;		@NonNull private ParcelableResource mResource;

	/**		/**
	* Creates an object containing the required information for updating an enterprise drawable		* Creates an object containing the required information for updating an enterprise drawable
	* resource using {@link DevicePolicyManager#setDrawables}.		* resource using {@link DevicePolicyResourcesManager#setDrawables}.
	*		*
	* <p>It will be used to update the drawable defined by {@code drawableId} with style		* <p>It will be used to update the drawable defined by {@code drawableId} with style
	* {@code drawableStyle} located in source {@code drawableSource} to the drawable with ID		* {@code drawableStyle} located in source {@code drawableSource} to the drawable with ID
	@@ -60,9 +59,9 @@ public final class DevicePolicyDrawableResource implements Parcelable {
	*/		*/
	public DevicePolicyDrawableResource(		public DevicePolicyDrawableResource(
	@NonNull Context context,		@NonNull Context context,
	@NonNull @DevicePolicyResources.UpdatableDrawableId String drawableId,		@NonNull String drawableId,
	@NonNull @DevicePolicyResources.UpdatableDrawableStyle String drawableStyle,		@NonNull String drawableStyle,
	@NonNull @DevicePolicyResources.UpdatableDrawableSource String drawableSource,		@NonNull String drawableSource,
	@DrawableRes int resourceIdInCallingPackage) {		@DrawableRes int resourceIdInCallingPackage) {
	this(drawableId, drawableStyle, drawableSource, resourceIdInCallingPackage,		this(drawableId, drawableStyle, drawableSource, resourceIdInCallingPackage,
	new ParcelableResource(context, resourceIdInCallingPackage,		new ParcelableResource(context, resourceIdInCallingPackage,
	@@ -70,9 +69,9 @@ public final class DevicePolicyDrawableResource implements Parcelable {
	}		}

	private DevicePolicyDrawableResource(		private DevicePolicyDrawableResource(
	@NonNull @DevicePolicyResources.UpdatableDrawableId String drawableId,		@NonNull String drawableId,
	@NonNull @DevicePolicyResources.UpdatableDrawableStyle String drawableStyle,		@NonNull String drawableStyle,
	@NonNull @DevicePolicyResources.UpdatableDrawableSource String drawableSource,		@NonNull String drawableSource,
	@DrawableRes int resourceIdInCallingPackage,		@DrawableRes int resourceIdInCallingPackage,
	@NonNull ParcelableResource resource) {		@NonNull ParcelableResource resource) {

	@@ -90,7 +89,7 @@ public final class DevicePolicyDrawableResource implements Parcelable {

	/**		/**
	* Creates an object containing the required information for updating an enterprise drawable		* Creates an object containing the required information for updating an enterprise drawable
	* resource using {@link DevicePolicyManager#setDrawables}.		* resource using {@link DevicePolicyResourcesManager#setDrawables}.
	* <p>It will be used to update the drawable defined by {@code drawableId} with style		* <p>It will be used to update the drawable defined by {@code drawableId} with style
	* {@code drawableStyle} to the drawable with ID {@code resourceIdInCallingPackage} in the		* {@code drawableStyle} to the drawable with ID {@code resourceIdInCallingPackage} in the
	* calling package</p>		* calling package</p>
	@@ -105,10 +104,10 @@ public final class DevicePolicyDrawableResource implements Parcelable {
	*/		*/
	public DevicePolicyDrawableResource(		public DevicePolicyDrawableResource(
	@NonNull Context context,		@NonNull Context context,
	@NonNull @DevicePolicyResources.UpdatableDrawableId String drawableId,		@NonNull String drawableId,
	@NonNull @DevicePolicyResources.UpdatableDrawableStyle String drawableStyle,		@NonNull String drawableStyle,
	@DrawableRes int resourceIdInCallingPackage) {		@DrawableRes int resourceIdInCallingPackage) {
	this(context, drawableId, drawableStyle, Drawables.Source.UNDEFINED,		this(context, drawableId, drawableStyle, DevicePolicyResources.UNDEFINED,
	resourceIdInCallingPackage);		resourceIdInCallingPackage);
	}		}

	@@ -116,7 +115,6 @@ public final class DevicePolicyDrawableResource implements Parcelable {
	* Returns the ID of the drawable to update.		* Returns the ID of the drawable to update.
	*/		*/
	@NonNull		@NonNull
	@DevicePolicyResources.UpdatableDrawableId
	public String getDrawableId() {		public String getDrawableId() {
	return mDrawableId;		return mDrawableId;
	}		}
	@@ -125,7 +123,6 @@ public final class DevicePolicyDrawableResource implements Parcelable {
	* Returns the style of the drawable to update		* Returns the style of the drawable to update
	*/		*/
	@NonNull		@NonNull
	@DevicePolicyResources.UpdatableDrawableStyle
	public String getDrawableStyle() {		public String getDrawableStyle() {
	return mDrawableStyle;		return mDrawableStyle;
	}		}
	@@ -134,7 +131,6 @@ public final class DevicePolicyDrawableResource implements Parcelable {
	* Returns the source of the drawable to update.		* Returns the source of the drawable to update.
	*/		*/
	@NonNull		@NonNull
	@DevicePolicyResources.UpdatableDrawableSource
	public String getDrawableSource() {		public String getDrawableSource() {
	return mDrawableSource;		return mDrawableSource;
	}		}

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

+9 −469

File changed.

Preview size limit exceeded, changes collapsed.

core/java/android/app/admin/DevicePolicyResources.java

+21 −1225

File changed.

Preview size limit exceeded, changes collapsed.