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

Commit 43a74d8b authored by Pavel Grafov's avatar Pavel Grafov
Browse files

Clean up fully rolled out EsimManagementEnabled 

Flag was rolled out in Android V. Keeping the flag definition since it is exported.

Bug: 335663055
Test: TH
Flag: EXEMPT flag cleanup
Change-Id: I9228322c473c9d19d0f351c6ed76ba7430c525a9
parent e2997126

core/api/current.txt

+3 −3
Original line number Diff line number Diff line
@@ -169,7 +169,7 @@ package android { 
    field public static final String MANAGE_DEVICE_POLICY_LOCK = "android.permission.MANAGE_DEVICE_POLICY_LOCK";

    field public static final String MANAGE_DEVICE_POLICY_LOCK_CREDENTIALS = "android.permission.MANAGE_DEVICE_POLICY_LOCK_CREDENTIALS";

    field public static final String MANAGE_DEVICE_POLICY_LOCK_TASK = "android.permission.MANAGE_DEVICE_POLICY_LOCK_TASK";

    field @FlaggedApi("android.app.admin.flags.esim_management_enabled") public static final String MANAGE_DEVICE_POLICY_MANAGED_SUBSCRIPTIONS = "android.permission.MANAGE_DEVICE_POLICY_MANAGED_SUBSCRIPTIONS";

    field public static final String MANAGE_DEVICE_POLICY_MANAGED_SUBSCRIPTIONS = "android.permission.MANAGE_DEVICE_POLICY_MANAGED_SUBSCRIPTIONS";

    field public static final String MANAGE_DEVICE_POLICY_METERED_DATA = "android.permission.MANAGE_DEVICE_POLICY_METERED_DATA";

    field public static final String MANAGE_DEVICE_POLICY_MICROPHONE = "android.permission.MANAGE_DEVICE_POLICY_MICROPHONE";

    field @FlaggedApi("android.app.admin.flags.dedicated_device_control_api_enabled") public static final String MANAGE_DEVICE_POLICY_MICROPHONE_TOGGLE = "android.permission.MANAGE_DEVICE_POLICY_MICROPHONE_TOGGLE";
@@ -8081,7 +8081,7 @@ package android.app.admin { 
    method public CharSequence getStartUserSessionMessage(@NonNull android.content.ComponentName);

    method @Deprecated public boolean getStorageEncryption(@Nullable android.content.ComponentName);

    method public int getStorageEncryptionStatus();

    method @FlaggedApi("android.app.admin.flags.esim_management_enabled") @NonNull @RequiresPermission(android.Manifest.permission.MANAGE_DEVICE_POLICY_MANAGED_SUBSCRIPTIONS) public java.util.Set<java.lang.Integer> getSubscriptionIds();

    method @NonNull @RequiresPermission(android.Manifest.permission.MANAGE_DEVICE_POLICY_MANAGED_SUBSCRIPTIONS) public java.util.Set<java.lang.Integer> getSubscriptionIds();

    method @Nullable public android.app.admin.SystemUpdatePolicy getSystemUpdatePolicy();

    method @Nullable public android.os.PersistableBundle getTransferOwnershipBundle();

    method @Nullable public java.util.List<android.os.PersistableBundle> getTrustAgentConfiguration(@Nullable android.content.ComponentName, @NonNull android.content.ComponentName);
@@ -34166,7 +34166,7 @@ package android.os { 
    field public static final String DISALLOW_SHARE_INTO_MANAGED_PROFILE = "no_sharing_into_profile";

    field public static final String DISALLOW_SHARE_LOCATION = "no_share_location";

    field public static final String DISALLOW_SHARING_ADMIN_CONFIGURED_WIFI = "no_sharing_admin_configured_wifi";

    field @FlaggedApi("android.app.admin.flags.esim_management_enabled") public static final String DISALLOW_SIM_GLOBALLY = "no_sim_globally";

    field public static final String DISALLOW_SIM_GLOBALLY = "no_sim_globally";

    field public static final String DISALLOW_SMS = "no_sms";

    field public static final String DISALLOW_SYSTEM_ERROR_DIALOGS = "no_system_error_dialogs";

    field @FlaggedApi("com.android.net.thread.platform.flags.thread_user_restriction_enabled") public static final String DISALLOW_THREAD_NETWORK = "no_thread_network";

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

+0 −2
Original line number Diff line number Diff line
@@ -56,7 +56,6 @@ 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_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_PROVISIONING_FIX_ENABLED;

import static android.app.admin.flags.Flags.onboardingBugreportV2Enabled;
@@ -17742,7 +17741,6 @@ public class DevicePolicyManager { 
     * @throws SecurityException if the caller is not authorized to call this method.

     * @return ids of all managed subscriptions currently downloaded by an admin on the device.

     */

    @FlaggedApi(FLAG_ESIM_MANAGEMENT_ENABLED)

    @RequiresPermission(android.Manifest.permission.MANAGE_DEVICE_POLICY_MANAGED_SUBSCRIPTIONS)

    @NonNull

    public Set<Integer> getSubscriptionIds() {

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

+1 −0
Original line number Diff line number Diff line
@@ -165,6 +165,7 @@ flag { 
  bug: "304999634"

}



# Fully rolled out and must not be used.

flag {

  name: "esim_management_enabled"

  is_exported: true

core/java/android/os/UserManager.java

+0 −1
Original line number Diff line number Diff line
@@ -1978,7 +1978,6 @@ public class UserManager { 
     * @see DevicePolicyManager#clearUserRestriction(ComponentName, String)

     * @see #getUserRestrictions()

     */

    @FlaggedApi(android.app.admin.flags.Flags.FLAG_ESIM_MANAGEMENT_ENABLED)

    public static final String DISALLOW_SIM_GLOBALLY =

            "no_sim_globally";

core/res/AndroidManifest.xml

+0 −1
Original line number Diff line number Diff line
@@ -4026,7 +4026,6 @@ 
        APIs protected by this permission on users different to the calling user.

        <p>Protection level: internal|role

        <p>Intended for use by the DEVICE_POLICY_MANAGEMENT role only.

        @FlaggedApi("android.app.admin.flags.esim_management_enabled")

    -->

    <permission android:name="android.permission.MANAGE_DEVICE_POLICY_MANAGED_SUBSCRIPTIONS"

        android:protectionLevel="internal|role" />