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

Commit f62a7e64 authored by kholoud mohamed's avatar kholoud mohamed Committed by Automerger Merge Worker
Browse files

RESTRICT AUTOMERGE Refactor device policy resource APIs to a separate class am: b7aedc6f 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17182686

Change-Id: I6b4b47276fba01e5c3f24b17069ff349309e350a
parents 1f9ea67f b7aedc6f

core/api/current.txt

+10 −30
Original line number Diff line number Diff line
@@ -7422,12 +7422,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);
@@ -7474,14 +7468,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);
@@ -7843,31 +7836,18 @@ package android.app.admin { 
  }















  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";















  }



























  public static final class DevicePolicyResources.Drawables.Style {













    field public static final String DEFAULT = "DEFAULT";













    field public static final String OUTLINE = "OUTLINE";













    field public static final String SOLID_COLORED = "SOLID_COLORED";













    field public static final String SOLID_NOT_COLORED = "SOLID_NOT_COLORED";













  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 {

























core/api/system-current.txt



+7
−41




























Original line number
Diff line number
Diff line








@@ -1104,16 +1104,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.SEND_LOST_MODE_LOCATION_UPDATES) 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";










@@ -1193,43 +1189,6 @@ package android.app.admin {













  }





























  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 {









@@ -1241,6 +1200,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/accounts/CantAddAccountActivity.java



+1
−1




























Original line number
Diff line number
Diff line








@@ -39,7 +39,7 @@ public class CantAddAccountActivity extends Activity {













        setContentView(R.layout.app_not_authorized);































        TextView view = findViewById(R.id.description);













        String text = getSystemService(DevicePolicyManager.class).getString(













        String text = getSystemService(DevicePolicyManager.class).getResources().getString(















                CANT_ADD_ACCOUNT_MESSAGE,















                () -> getString(R.string.error_message_change_not_allowed));















        view.setText(text);

































core/java/android/accounts/ChooseTypeAndAccountActivity.java



+1
−1




























Original line number
Diff line number
Diff line








@@ -205,7 +205,7 @@ public class ChooseTypeAndAccountActivity extends Activity





























            setContentView(R.layout.app_not_authorized);















            TextView view = findViewById(R.id.description);













            String text = getSystemService(DevicePolicyManager.class).getString(













            String text = getSystemService(DevicePolicyManager.class).getResources().getString(















                    CANT_ADD_ACCOUNT_MESSAGE,















                    () -> getString(R.string.error_message_change_not_allowed));















            view.setText(text);

































core/java/android/app/ApplicationPackageManager.java



+9
−8




























Original line number
Diff line number
Diff line








@@ -18,9 +18,9 @@ package android.app;





























import static android.app.admin.DevicePolicyResources.Drawables.Style.SOLID_COLORED;















import static android.app.admin.DevicePolicyResources.Drawables.Style.SOLID_NOT_COLORED;













import static android.app.admin.DevicePolicyResources.Drawables.UNDEFINED;















import static android.app.admin.DevicePolicyResources.Drawables.WORK_PROFILE_ICON;















import static android.app.admin.DevicePolicyResources.Drawables.WORK_PROFILE_ICON_BADGE;













import static android.app.admin.DevicePolicyResources.UNDEFINED;















import static android.content.pm.Checksum.TYPE_PARTIAL_MERKLE_ROOT_1M_SHA256;















import static android.content.pm.Checksum.TYPE_PARTIAL_MERKLE_ROOT_1M_SHA512;















import static android.content.pm.Checksum.TYPE_WHOLE_MD5;










@@ -1886,7 +1886,7 @@ public class ApplicationPackageManager extends PackageManager {













            return icon;















        }





























        final Drawable badgeForeground = getDevicePolicyManager().getDrawable(













        final Drawable badgeForeground = getDevicePolicyManager().getResources().getDrawable(















                getUpdatableUserIconBadgeId(user),















                SOLID_COLORED,















                () -> getDefaultUserIconBadge(user));










@@ -1938,7 +1938,8 @@ public class ApplicationPackageManager extends PackageManager {













            return null;















        }





























        final Drawable badgeForeground = getDevicePolicyManager().getDrawableForDensity(













        final Drawable badgeForeground = getDevicePolicyManager().getResources()













                .getDrawableForDensity(















                        getUpdatableUserBadgeId(user),















                        SOLID_COLORED,















                        density,










@@ -1968,7 +1969,7 @@ public class ApplicationPackageManager extends PackageManager {













            return null;















        }





























        final Drawable badge = getDevicePolicyManager().getDrawableForDensity(













        final Drawable badge = getDevicePolicyManager().getResources().getDrawableForDensity(















                getUpdatableUserBadgeId(user),















                SOLID_NOT_COLORED,















                density,