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

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

Merge "Cleanup dedicated_device_control_* flags" into main

parents 19ad13cc ca6937ae

core/api/current.txt

+3 −3
Original line number Diff line number Diff line
@@ -145,12 +145,12 @@ package android { 
    field public static final String MANAGE_DEVICE_POLICY_AUDIO_OUTPUT = "android.permission.MANAGE_DEVICE_POLICY_AUDIO_OUTPUT";

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

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

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

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

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

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

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

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

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

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

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

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

    field @FlaggedApi("android.view.contentprotection.flags.manage_device_policy_enabled") public static final String MANAGE_DEVICE_POLICY_CONTENT_PROTECTION = "android.permission.MANAGE_DEVICE_POLICY_CONTENT_PROTECTION";
@@ -172,7 +172,7 @@ package android { 
    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";

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

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

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

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

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

+1 −7
Original line number Diff line number Diff line
@@ -38,13 +38,7 @@ flag { 
  is_fixed_read_only: true

}



flag {

  name: "dedicated_device_control_enabled"

  namespace: "enterprise"

  description: "Allow the device management role holder to control which platform features are available on dedicated devices."

  bug: "281964214"

}



# Fully rolled out and must not be used.

flag {

  name: "dedicated_device_control_api_enabled"

  is_exported: true

core/res/AndroidManifest.xml

+0 −3
Original line number Diff line number Diff line
@@ -4033,7 +4033,6 @@ 
    <!-- Allows an application to manage policy related to block package uninstallation.

        <p>Protection level: internal|role

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

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

    -->

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

        android:protectionLevel="internal|role" />
@@ -4041,7 +4040,6 @@ 
    <!-- Allows an application to manage policy related to camera toggle.

        <p>Protection level: internal|role

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

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

    -->

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

        android:protectionLevel="internal|role" />
@@ -4049,7 +4047,6 @@ 
    <!-- Allows an application to manage policy related to microphone toggle.

        <p>Protection level: internal|role

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

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

    -->

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

        android:protectionLevel="internal|role" />