Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 832f2b11 authored by kholoud mohamed's avatar kholoud mohamed
Browse files

RESTRICT AUTOMERGE move device policy resource APIs to a separate class 

Bug: 217388602
Test: atest EnterpriseResourcesTests
Change-Id: I83b399f36dfe3ba93d625807659dee59d872097e
parent 81709c37

core/api/current.txt

+12 −8
Original line number 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 public CharSequence getDeviceOwnerLockScreenInfo();

    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 @NonNull public String getEnrollmentSpecificId();

    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 public int getRequiredPasswordComplexity();

    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 java.util.List<android.os.UserHandle> getSecondaryUsers(@NonNull android.content.ComponentName);

    method public CharSequence getShortSupportMessage(@NonNull android.content.ComponentName);

    method public CharSequence getStartUserSessionMessage(@NonNull android.content.ComponentName);

    method @Deprecated public boolean getStorageEncryption(@Nullable android.content.ComponentName);

    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.os.PersistableBundle getTransferOwnershipBundle();

    method @Nullable public java.util.List<android.os.PersistableBundle> getTrustAgentConfiguration(@Nullable android.content.ComponentName, @NonNull android.content.ComponentName);
@@ -7842,6 +7835,17 @@ package android.app.admin { 
    field public static final String UNDEFINED = "UNDEFINED";

  }













  public class DevicePolicyResourcesManager {













    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 @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 {















    method public String getHostname();















    method public java.util.List<java.net.InetAddress> getInetAddresses();

























core/api/system-current.txt



+7
−4




























Original line number
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.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(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 @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_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 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_ROLE_HOLDERS) public boolean shouldAllowBypassingDevicePolicyManagementRoleQualification();















    field public static final String ACCOUNT_FEATURE_DEVICE_OR_PROFILE_OWNER_ALLOWED = "android.account.DEVICE_OR_PROFILE_OWNER_ALLOWED";










@@ -1209,6 +1205,13 @@ package android.app.admin {













    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 {















    ctor public DevicePolicyStringResource(@NonNull android.content.Context, @NonNull String, @StringRes int);















    method public int describeContents();

























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



+3
−3




























Original line number
Diff line number
Diff line








@@ -28,7 +28,7 @@ import java.util.Objects;





























/**















 * Used to pass in the required information for updating an enterprise drawable resource using













 * {@link DevicePolicyManager#setDrawables}.













 * {@link DevicePolicyResourcesManager#setDrawables}.















 *















 * @hide















 */









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





























    /**















     * 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















     * {@code drawableStyle} located in source {@code drawableSource} to the drawable with ID










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





























    /**















     * 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















     * {@code drawableStyle} to the drawable with ID {@code resourceIdInCallingPackage} in the















     * calling package</p>

































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



+9
−463


























File changed.
Preview size limit exceeded, changes collapsed.
























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



+2
−1




























Original line number
Diff line number
Diff line








@@ -22,7 +22,8 @@ import android.os.UserHandle;













/**















 * Class containing the required identifiers to update device management resources.















 *













 * <p>See {@link DevicePolicyManager#getDrawable} and {@link DevicePolicyManager#getString}.













 * <p>See {@link DevicePolicyResourcesManager#getDrawable} and













 * {@link DevicePolicyResourcesManager#getString}.















 */















public final class DevicePolicyResources {