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

Commit 1e86bd39 authored by Priyanka Advani (xWF)'s avatar Priyanka Advani (xWF) Committed by Android (Google) Code Review
Browse files

Merge changes from topic "revert-28993807-hdop-cleaup-KJEMMYZIMI" into main 

* changes:
  Revert "Clean up fully rolled out DeletePrivateSpaceUnderRestriction"
  Revert "Clean up fully rolled out PolicyEngineMigrationV2Enabled"
  Revert "Clean up fully rolled out HeadlessDeviceOwnerDelegateSec..."
  Revert "Clean up fully rolled out DmrhSetAppRestrictions"
  Revert "Clean up fully rolled out DevicePolicySizeTrackingIntern..."
  Revert "Clean up fully rolled out AllowScreenBrightnessControlOnCope"
  Revert "Clean up fully rolled out PermissionMigrationForZeroTrus..."
  Revert "Clean up fully rolled out HeadlessSingleUserFixes"
  Revert "Clean up fully rolled out HeadlessDeviceOwnerProvisionin..."
parents 66513108 41a74810

core/api/current.txt

+2 −2
Original line number Diff line number Diff line
@@ -7964,13 +7964,13 @@ package android.app.admin { 
    field public static final String LOCK_TASK_POLICY = "lockTask";

    field public static final String PACKAGES_SUSPENDED_POLICY = "packagesSuspended";

    field public static final String PACKAGE_UNINSTALL_BLOCKED_POLICY = "packageUninstallBlocked";

    field public static final String PASSWORD_COMPLEXITY_POLICY = "passwordComplexity";

    field @FlaggedApi("android.app.admin.flags.policy_engine_migration_v2_enabled") public static final String PASSWORD_COMPLEXITY_POLICY = "passwordComplexity";

    field public static final String PERMISSION_GRANT_POLICY = "permissionGrant";

    field public static final String PERSISTENT_PREFERRED_ACTIVITY_POLICY = "persistentPreferredActivity";

    field public static final String RESET_PASSWORD_TOKEN_POLICY = "resetPasswordToken";

    field public static final String SECURITY_LOGGING_POLICY = "securityLogging";

    field public static final String STATUS_BAR_DISABLED_POLICY = "statusBarDisabled";

    field public static final String USB_DATA_SIGNALING_POLICY = "usbDataSignaling";

    field @FlaggedApi("android.app.admin.flags.policy_engine_migration_v2_enabled") public static final String USB_DATA_SIGNALING_POLICY = "usbDataSignaling";

    field public static final String USER_CONTROL_DISABLED_PACKAGES_POLICY = "userControlDisabledPackages";

  }

























core/api/test-current.txt



+4
−4




























Original line number
Diff line number
Diff line








@@ -597,19 +597,19 @@ package android.app.admin {













    method @RequiresPermission(android.Manifest.permission.FORCE_DEVICE_POLICY_MANAGER_LOGS) public long forceNetworkLogs();















    method @RequiresPermission(android.Manifest.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS) public void forceRemoveActiveAdmin(@NonNull android.content.ComponentName, int);















    method @RequiresPermission(android.Manifest.permission.FORCE_DEVICE_POLICY_MANAGER_LOGS) public long forceSecurityLogs();













    method @RequiresPermission("android.permission.MANAGE_DEVICE_POLICY_STORAGE_LIMIT") public void forceSetMaxPolicyStorageLimit(int);













    method @FlaggedApi("android.app.admin.flags.device_policy_size_tracking_internal_bug_fix_enabled") @RequiresPermission("android.permission.MANAGE_DEVICE_POLICY_STORAGE_LIMIT") public void forceSetMaxPolicyStorageLimit(int);















    method public void forceUpdateUserSetupComplete(int);















    method @NonNull public java.util.Set<java.lang.String> getDefaultCrossProfilePackages();















    method @Deprecated public int getDeviceOwnerType(@NonNull android.content.ComponentName);















    method @Nullable public String getDevicePolicyManagementRoleHolderUpdaterPackage();















    method @NonNull public java.util.Set<java.lang.String> getDisallowedSystemApps(@NonNull android.content.ComponentName, int, @NonNull String);













    method @RequiresPermission(android.Manifest.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS) public int getHeadlessDeviceOwnerMode();













    method @FlaggedApi("android.app.admin.flags.headless_device_owner_provisioning_fix_enabled") @RequiresPermission(android.Manifest.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS) public int getHeadlessDeviceOwnerMode();















    method public long getLastBugReportRequestTime();















    method public long getLastNetworkLogRetrievalTime();















    method public long getLastSecurityLogRetrievalTime();















    method public java.util.List<java.lang.String> getOwnerInstalledCaCerts(@NonNull android.os.UserHandle);















    method @NonNull @RequiresPermission(android.Manifest.permission.MANAGE_DEVICE_ADMINS) public java.util.Set<java.lang.String> getPolicyExemptApps();













    method @RequiresPermission("android.permission.MANAGE_DEVICE_POLICY_STORAGE_LIMIT") public int getPolicySizeForAdmin(@NonNull android.app.admin.EnforcingAdmin);













    method @FlaggedApi("android.app.admin.flags.device_policy_size_tracking_internal_bug_fix_enabled") @RequiresPermission("android.permission.MANAGE_DEVICE_POLICY_STORAGE_LIMIT") public int getPolicySizeForAdmin(@NonNull android.app.admin.EnforcingAdmin);















    method public boolean isCurrentInputMethodSetByOwner();















    method public boolean isFactoryResetProtectionPolicySupported();















    method @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.INTERACT_ACROSS_USERS}) public boolean isNewUserDisclaimerAcknowledged();










@@ -680,7 +680,7 @@ package android.app.admin {













  }































  public final class EnforcingAdmin implements android.os.Parcelable {













    ctor public EnforcingAdmin(@NonNull String, @NonNull android.app.admin.Authority, @NonNull android.os.UserHandle, @Nullable android.content.ComponentName);













    ctor @FlaggedApi("android.app.admin.flags.device_policy_size_tracking_internal_bug_fix_enabled") public EnforcingAdmin(@NonNull String, @NonNull android.app.admin.Authority, @NonNull android.os.UserHandle, @Nullable android.content.ComponentName);















  }































  public final class FlagUnion extends android.app.admin.ResolutionMechanism<java.lang.Integer> {

































core/java/android/app/admin/AccountTypePolicyKey.java



+4
−1




























Original line number
Diff line number
Diff line








@@ -24,6 +24,7 @@ import android.annotation.NonNull;













import android.annotation.Nullable;















import android.annotation.SystemApi;















import android.annotation.TestApi;













import android.app.admin.flags.Flags;















import android.os.Bundle;















import android.os.Parcel;


























@@ -53,7 +54,9 @@ public final class AccountTypePolicyKey extends PolicyKey {













    @TestApi















    public AccountTypePolicyKey(@NonNull String key, @NonNull String accountType) {















        super(key);













        if (Flags.devicePolicySizeTrackingInternalBugFixEnabled()) {















            PolicySizeVerifier.enforceMaxStringLength(accountType, "accountType");













        }















        mAccountType = Objects.requireNonNull((accountType));















    }

















































core/java/android/app/admin/BundlePolicyValue.java



+4
−1




























Original line number
Diff line number
Diff line








@@ -18,6 +18,7 @@ package android.app.admin;





























import android.annotation.NonNull;















import android.annotation.Nullable;













import android.app.admin.flags.Flags;















import android.os.Bundle;















import android.os.Parcel;

























@@ -30,8 +31,10 @@ public final class BundlePolicyValue extends PolicyValue<Bundle> {





























    public BundlePolicyValue(Bundle value) {















        super(value);













        if (Flags.devicePolicySizeTrackingInternalBugFixEnabled()) {















            PolicySizeVerifier.enforceMaxBundleFieldsLength(value);















        }













    }































    private BundlePolicyValue(Parcel source) {















        this(source.readBundle());

































core/java/android/app/admin/ComponentNamePolicyValue.java



+4
−1




























Original line number
Diff line number
Diff line








@@ -18,6 +18,7 @@ package android.app.admin;





























import android.annotation.NonNull;















import android.annotation.Nullable;













import android.app.admin.flags.Flags;















import android.content.ComponentName;















import android.os.Parcel;

























@@ -30,8 +31,10 @@ public final class ComponentNamePolicyValue extends PolicyValue<ComponentName> {





























    public ComponentNamePolicyValue(@NonNull ComponentName value) {















        super(value);













        if (Flags.devicePolicySizeTrackingInternalBugFixEnabled()) {















            PolicySizeVerifier.enforceMaxComponentNameLength(value);















        }













    }































    private ComponentNamePolicyValue(Parcel source) {















        this((ComponentName) source.readParcelable(ComponentName.class.getClassLoader()));