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

Commit 0279ff6d authored by Pavel Grafov's avatar Pavel Grafov
Browse files

Clean up fully rolled out DevicePolicySizeTrackingInternalBugFixEnabled

Flag was rolled out in Android V.

Bug: 335663055
Test: TH
Flag: EXEMPT flag cleanup
Change-Id: I178e739afa2ee122749119f944d29be5cbca7fec
parent cc862807
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
@@ -597,7 +597,7 @@ 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 @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 @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);
@@ -609,7 +609,7 @@ package android.app.admin {
    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 @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 @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 @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);
    ctor 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> {
+1 −4
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ 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;

@@ -54,9 +53,7 @@ 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));
    }

+1 −4
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ 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;

@@ -31,10 +30,8 @@ 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());
+1 −4
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ 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;

@@ -31,10 +30,8 @@ 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()));
+0 −3
Original line number Diff line number Diff line
@@ -54,7 +54,6 @@ import static android.Manifest.permission.REQUEST_PASSWORD_COMPLEXITY;
import static android.Manifest.permission.SET_TIME;
import static android.Manifest.permission.SET_TIME_ZONE;
import static android.app.admin.DeviceAdminInfo.HEADLESS_DEVICE_OWNER_MODE_UNSUPPORTED;
import static android.app.admin.flags.Flags.FLAG_DEVICE_POLICY_SIZE_TRACKING_INTERNAL_BUG_FIX_ENABLED;
import static android.app.admin.flags.Flags.FLAG_DEVICE_THEFT_API_ENABLED;
import static android.app.admin.flags.Flags.FLAG_DEVICE_POLICY_SIZE_TRACKING_ENABLED;
import static android.app.admin.flags.Flags.FLAG_HEADLESS_DEVICE_OWNER_PROVISIONING_FIX_ENABLED;
@@ -17809,7 +17808,6 @@ public class DevicePolicyManager {
     */
    @TestApi
    @RequiresPermission(permission.MANAGE_DEVICE_POLICY_STORAGE_LIMIT)
    @FlaggedApi(FLAG_DEVICE_POLICY_SIZE_TRACKING_INTERNAL_BUG_FIX_ENABLED)
    public void forceSetMaxPolicyStorageLimit(int storageLimit) {
        if (mService != null) {
            try {
@@ -17827,7 +17825,6 @@ public class DevicePolicyManager {
     */
    @TestApi
    @RequiresPermission(permission.MANAGE_DEVICE_POLICY_STORAGE_LIMIT)
    @FlaggedApi(FLAG_DEVICE_POLICY_SIZE_TRACKING_INTERNAL_BUG_FIX_ENABLED)
    public int getPolicySizeForAdmin(@NonNull EnforcingAdmin admin) {
        if (mService != null) {
            try {
Loading