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

Commit 5a89d72c authored by Pavel Grafov's avatar Pavel Grafov Committed by Android (Google) Code Review
Browse files

Merge "Cleanup device_policy_size_tracking_*" into main

parents e4f14a4d 58ad40f4

core/api/system-current.txt

+2 −2
Original line number Diff line number Diff line
@@ -1322,7 +1322,7 @@ package android.app.admin { 
    method @Nullable @RequiresPermission(android.Manifest.permission.MANAGE_USERS) public android.os.UserHandle getDeviceOwnerUser();

    method @NonNull @RequiresPermission(android.Manifest.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS) public android.app.admin.DevicePolicyState getDevicePolicyState();

    method @Nullable @RequiresPermission(android.Manifest.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS) public String getFinancedDeviceKioskRoleHolder();

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

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

    method @Nullable @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.QUERY_ADMIN_POLICY}) public java.util.List<java.lang.String> getPermittedAccessibilityServices(int);

    method @Nullable @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.QUERY_ADMIN_POLICY}) public java.util.List<java.lang.String> getPermittedInputMethodsForCurrentUser();

    method @NonNull @RequiresPermission(android.Manifest.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS) public java.util.List<android.os.UserHandle> getPolicyManagedProfiles(@NonNull android.os.UserHandle);
@@ -1349,7 +1349,7 @@ package android.app.admin { 
    method @RequiresPermission(android.Manifest.permission.MANAGE_DEVICE_POLICY_AUDIT_LOGGING) public void setAuditLogEventCallback(@NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.util.List<android.app.admin.SecurityLog.SecurityEvent>>);

    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 @FlaggedApi("android.app.admin.flags.device_policy_size_tracking_enabled") @RequiresPermission(android.Manifest.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS) public void setMaxPolicyStorageLimit(int);

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

    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.MANAGE_PROFILE_AND_DEVICE_OWNERS) public void setUserProvisioningState(int, @NonNull android.os.UserHandle);

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

+0 −3
Original line number Diff line number Diff line
@@ -55,7 +55,6 @@ 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_THEFT_API_ENABLED;

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

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

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

import static android.content.Intent.LOCAL_FLAG_FROM_SYSTEM;
@@ -17744,7 +17743,6 @@ public class DevicePolicyManager { 
     */

    @SystemApi

    @RequiresPermission(permission.MANAGE_PROFILE_AND_DEVICE_OWNERS)

    @FlaggedApi(FLAG_DEVICE_POLICY_SIZE_TRACKING_ENABLED)

    public void setMaxPolicyStorageLimit(int storageLimit) {

        if (mService != null) {

            try {
@@ -17764,7 +17762,6 @@ public class DevicePolicyManager { 
     */

    @SystemApi

    @RequiresPermission(permission.MANAGE_PROFILE_AND_DEVICE_OWNERS)

    @FlaggedApi(FLAG_DEVICE_POLICY_SIZE_TRACKING_ENABLED)

    public int getMaxPolicyStorageLimit() {

        if (mService != null) {

            try {

core/java/android/app/admin/flags/flags.aconfig

+1 −7
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ flag { 
  bug: "289520697"

}



# Fully rolled out and must not be used.

flag {

  name: "device_policy_size_tracking_enabled"

  is_exported: true
@@ -21,13 +22,6 @@ flag { 
  bug: "281543351"

}



flag {

  name: "device_policy_size_tracking_internal_enabled"

  namespace: "enterprise"

  description: "Add feature to track the total policy size and have a max threshold - internal changes"

  bug: "281543351"

}



flag {

  name: "onboarding_bugreport_v2_enabled"

  is_exported: true