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

Commit ea94f6db authored by Kholoud Mohamed's avatar Kholoud Mohamed Committed by Android (Google) Code Review
Browse files

Merge "create a separate flag for the internal policy size tracking changes" into main

parents daa478f4 1cccfce5

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

+2 −2
Original line number Diff line number Diff line
@@ -19,12 +19,12 @@ package android.app.admin; 
import static android.app.admin.PolicyUpdateReceiver.EXTRA_ACCOUNT_TYPE;

import static android.app.admin.PolicyUpdateReceiver.EXTRA_POLICY_BUNDLE_KEY;

import static android.app.admin.PolicyUpdateReceiver.EXTRA_POLICY_KEY;

import static android.app.admin.flags.Flags.devicePolicySizeTrackingEnabled;



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,7 +54,7 @@ public final class AccountTypePolicyKey extends PolicyKey { 
    @TestApi

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

        super(key);

        if (devicePolicySizeTrackingEnabled()) {

        if (Flags.devicePolicySizeTrackingInternalEnabled()) {

            PolicySizeVerifier.enforceMaxStringLength(accountType, "accountType");

        }

        mAccountType = Objects.requireNonNull((accountType));

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

+2 −3
Original line number Diff line number Diff line
@@ -16,10 +16,9 @@ 


package android.app.admin;



import static android.app.admin.flags.Flags.devicePolicySizeTrackingEnabled;



import android.annotation.NonNull;

import android.annotation.Nullable;

import android.app.admin.flags.Flags;

import android.os.Bundle;

import android.os.Parcel;
@@ -32,7 +31,7 @@ public final class BundlePolicyValue extends PolicyValue<Bundle> { 


    public BundlePolicyValue(Bundle value) {

        super(value);

        if (devicePolicySizeTrackingEnabled()) {

        if (Flags.devicePolicySizeTrackingInternalEnabled()) {

            PolicySizeVerifier.enforceMaxParcelableFieldsLength(value);

        }

    }

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

+2 −3
Original line number Diff line number Diff line
@@ -16,10 +16,9 @@ 


package android.app.admin;



import static android.app.admin.flags.Flags.devicePolicySizeTrackingEnabled;



import android.annotation.NonNull;

import android.annotation.Nullable;

import android.app.admin.flags.Flags;

import android.content.ComponentName;

import android.os.Parcel;
@@ -32,7 +31,7 @@ public final class ComponentNamePolicyValue extends PolicyValue<ComponentName> { 


    public ComponentNamePolicyValue(@NonNull ComponentName value) {

        super(value);

        if (devicePolicySizeTrackingEnabled()) {

        if (Flags.devicePolicySizeTrackingInternalEnabled()) {

            PolicySizeVerifier.enforceMaxComponentNameLength(value);

        }

    }

core/java/android/app/admin/IntentFilterPolicyKey.java

+2 −2
Original line number Diff line number Diff line
@@ -19,12 +19,12 @@ package android.app.admin; 
import static android.app.admin.PolicyUpdateReceiver.EXTRA_INTENT_FILTER;

import static android.app.admin.PolicyUpdateReceiver.EXTRA_POLICY_BUNDLE_KEY;

import static android.app.admin.PolicyUpdateReceiver.EXTRA_POLICY_KEY;

import static android.app.admin.flags.Flags.devicePolicySizeTrackingEnabled;



import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.SystemApi;

import android.annotation.TestApi;

import android.app.admin.flags.Flags;

import android.content.IntentFilter;

import android.os.Bundle;

import android.os.Parcel;
@@ -60,7 +60,7 @@ public final class IntentFilterPolicyKey extends PolicyKey { 
    @TestApi

    public IntentFilterPolicyKey(@NonNull String identifier, @NonNull IntentFilter filter) {

        super(identifier);

        if (devicePolicySizeTrackingEnabled()) {

        if (Flags.devicePolicySizeTrackingInternalEnabled()) {

            PolicySizeVerifier.enforceMaxParcelableFieldsLength(filter);

        }

        mFilter = Objects.requireNonNull(filter);

core/java/android/app/admin/LockTaskPolicy.java

+2 −3
Original line number Diff line number Diff line
@@ -16,11 +16,10 @@ 


package android.app.admin;



import static android.app.admin.flags.Flags.devicePolicySizeTrackingEnabled;



import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.SystemApi;

import android.app.admin.flags.Flags;

import android.os.Parcel;

import android.os.Parcelable;
@@ -136,7 +135,7 @@ public final class LockTaskPolicy extends PolicyValue<LockTaskPolicy> { 
    }



    private void setPackagesInternal(Set<String> packages) {

        if (devicePolicySizeTrackingEnabled()) {

        if (Flags.devicePolicySizeTrackingInternalEnabled()) {

            for (String p : packages) {

                PolicySizeVerifier.enforceMaxPackageNameLength(p);

            }