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

Commit 90150096 authored by Rubin Xu's avatar Rubin Xu
Browse files

Remove flagging from existing Device Policy APIs 

Early in the Android V release, permission annotations were
added to getEnrollmentSpecificId() and getPendingSystemUpdate(),
both of which are existing public APIs. These changes were
erroneously flagged, causing them to disappear from the beta
release. Fix this by removing the flagging.

Bug: 331121264
Test: builds
Change-Id: Ia2ed00e9075a53fe543902b5706ee22e29ffd0d4
parent 98d7df02

core/api/current.txt

+2 −2
Original line number Diff line number Diff line
@@ -8028,7 +8028,7 @@ package android.app.admin { 
    method public CharSequence getDeviceOwnerLockScreenInfo();

    method @Nullable public String getDevicePolicyManagementRoleHolderPackage();

    method public CharSequence getEndUserSessionMessage(@NonNull android.content.ComponentName);

    method @FlaggedApi("android.app.admin.flags.permission_migration_for_zero_trust_api_enabled") @NonNull @RequiresPermission(value=android.Manifest.permission.MANAGE_DEVICE_POLICY_CERTIFICATES, conditional=true) public String getEnrollmentSpecificId();

    method @NonNull @RequiresPermission(value=android.Manifest.permission.MANAGE_DEVICE_POLICY_CERTIFICATES, conditional=true) public String getEnrollmentSpecificId();

    method @Nullable @RequiresPermission(value=android.Manifest.permission.MANAGE_DEVICE_POLICY_FACTORY_RESET, conditional=true) public android.app.admin.FactoryResetProtectionPolicy getFactoryResetProtectionPolicy(@Nullable android.content.ComponentName);

    method @Nullable public String getGlobalPrivateDnsHost(@NonNull android.content.ComponentName);

    method public int getGlobalPrivateDnsMode(@NonNull android.content.ComponentName);
@@ -8067,7 +8067,7 @@ package android.app.admin { 
    method @Deprecated public int getPasswordMinimumSymbols(@Nullable android.content.ComponentName);

    method @Deprecated public int getPasswordMinimumUpperCase(@Nullable android.content.ComponentName);

    method @Deprecated public int getPasswordQuality(@Nullable android.content.ComponentName);

    method @FlaggedApi("android.app.admin.flags.permission_migration_for_zero_trust_api_enabled") @Nullable @RequiresPermission(value=android.Manifest.permission.MANAGE_DEVICE_POLICY_QUERY_SYSTEM_UPDATES, conditional=true) public android.app.admin.SystemUpdateInfo getPendingSystemUpdate(@Nullable android.content.ComponentName);

    method @Nullable @RequiresPermission(value=android.Manifest.permission.MANAGE_DEVICE_POLICY_QUERY_SYSTEM_UPDATES, conditional=true) public android.app.admin.SystemUpdateInfo getPendingSystemUpdate(@Nullable android.content.ComponentName);

    method @RequiresPermission(value=android.Manifest.permission.MANAGE_DEVICE_POLICY_RUNTIME_PERMISSIONS, conditional=true) public int getPermissionGrantState(@Nullable android.content.ComponentName, @NonNull String, @NonNull String);

    method public int getPermissionPolicy(android.content.ComponentName);

    method @Nullable public java.util.List<java.lang.String> getPermittedAccessibilityServices(@NonNull android.content.ComponentName);

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

+0 −3
Original line number Diff line number Diff line
@@ -58,7 +58,6 @@ import static android.app.admin.flags.Flags.FLAG_DEVICE_THEFT_API_ENABLED; 
import static android.app.admin.flags.Flags.FLAG_ESIM_MANAGEMENT_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_SINGLE_USER_ENABLED;

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

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

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

import static android.app.admin.flags.Flags.FLAG_IS_MTE_POLICY_ENFORCED;
@@ -13462,7 +13461,6 @@ public class DevicePolicyManager { 
     */

    @RequiresPermission(value = MANAGE_DEVICE_POLICY_QUERY_SYSTEM_UPDATES, conditional = true)

    @SuppressLint("RequiresPermission")

    @FlaggedApi(FLAG_PERMISSION_MIGRATION_FOR_ZERO_TRUST_API_ENABLED)

    public @Nullable SystemUpdateInfo getPendingSystemUpdate(@Nullable ComponentName admin) {

        throwIfParentInstance("getPendingSystemUpdate");

        try {
@@ -16638,7 +16636,6 @@ public class DevicePolicyManager { 
     */

    @RequiresPermission(value = MANAGE_DEVICE_POLICY_CERTIFICATES, conditional = true)

    @SuppressLint("RequiresPermission")

    @FlaggedApi(FLAG_PERMISSION_MIGRATION_FOR_ZERO_TRUST_API_ENABLED)

    @NonNull public String getEnrollmentSpecificId() {

        throwIfParentInstance("getEnrollmentSpecificId");

        if (mService == null) {