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

Commit 0d9e07dd authored by Pavel Grafov's avatar Pavel Grafov
Browse files

Clean up fully rolled out AssistContentUserRestrictionEnabled 

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

+ removed duplicate line adding it to the USER_RESTRICTION_FLAGS

Bug: 335663055
Test: TH
Flag: EXEMPT flag cleanup
Change-Id: I836ca14de9aa5efb0ba7b89fd3fa60dd796d5a3f
parent 43a74d8b

core/api/current.txt

+2 −2
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@ package android { 
    field public static final String MANAGE_DEVICE_POLICY_APPS_CONTROL = "android.permission.MANAGE_DEVICE_POLICY_APPS_CONTROL";

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

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

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

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

    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";
@@ -34116,7 +34116,7 @@ package android.os { 
    field public static final String DISALLOW_AIRPLANE_MODE = "no_airplane_mode";

    field public static final String DISALLOW_AMBIENT_DISPLAY = "no_ambient_display";

    field public static final String DISALLOW_APPS_CONTROL = "no_control_apps";

    field @FlaggedApi("android.app.admin.flags.assist_content_user_restriction_enabled") public static final String DISALLOW_ASSIST_CONTENT = "no_assist_content";

    field public static final String DISALLOW_ASSIST_CONTENT = "no_assist_content";

    field public static final String DISALLOW_AUTOFILL = "no_autofill";

    field public static final String DISALLOW_BLUETOOTH = "no_bluetooth";

    field public static final String DISALLOW_BLUETOOTH_SHARING = "no_bluetooth_sharing";

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

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

}



# Fully rolled out and must not be used.

flag {

  name: "assist_content_user_restriction_enabled"

  is_exported: true

core/java/android/os/UserManager.java

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

     * @see #getUserRestrictions()

     */

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

    public static final String DISALLOW_ASSIST_CONTENT = "no_assist_content";



    /**

core/res/AndroidManifest.xml

+0 −1
Original line number Diff line number Diff line
@@ -3765,7 +3765,6 @@ 
        privileged app such as the Assistant app.

        <p>Protection level: internal|role

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

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

    -->

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

        android:protectionLevel="internal|role" />

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

+3 −5
Original line number Diff line number Diff line
@@ -13972,11 +13972,9 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
                    UserManager.DISALLOW_THREAD_NETWORK,

                    new String[]{MANAGE_DEVICE_POLICY_THREAD_NETWORK});

        }

        if (Flags.assistContentUserRestrictionEnabled()) {

        USER_RESTRICTION_PERMISSIONS.put(

                UserManager.DISALLOW_ASSIST_CONTENT,

                new String[]{MANAGE_DEVICE_POLICY_ASSIST_CONTENT});

        }

        USER_RESTRICTION_PERMISSIONS.put(

                UserManager.DISALLOW_ULTRA_WIDEBAND_RADIO, new String[]{MANAGE_DEVICE_POLICY_NEARBY_COMMUNICATION});

        USER_RESTRICTION_PERMISSIONS.put(