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

Commit 6c1bd4b3 authored by Jay Sullivan's avatar Jay Sullivan Committed by Android (Google) Code Review
Browse files

Merge "[Role Logic Move] Rename feature flag" into main

parents 5e69e33e ba241061

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

+1 −1
Original line number Diff line number Diff line
@@ -9146,7 +9146,7 @@ public class DevicePolicyManager { 
    @UserHandleAware(enabledSinceTargetSdkVersion = Build.VERSION_CODES.VANILLA_ICE_CREAM)

    public boolean isDeviceOwnerApp(String packageName) {

        throwIfParentInstance("isDeviceOwnerApp");

        if (android.permission.flags.Flags.roleControllerInSystemServer()

        if (android.permission.flags.Flags.systemServerRoleControllerEnabled()

                && CompatChanges.isChangeEnabled(IS_DEVICE_OWNER_USER_AWARE)) {

            return isDeviceOwnerAppOnContextUser(packageName);

        }

core/java/android/permission/flags.aconfig

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ flag { 
}



flag {

    name: "role_controller_in_system_server"

    name: "system_server_role_controller_enabled"

    is_fixed_read_only: true

    namespace: "permissions"

    description: "enable role controller in system server"