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

Commit 9505d8b6 authored by Alex Johnston's avatar Alex Johnston
Browse files

Allow admin flags to be used in PermissionController 

This was added in ag/30579369 but was reverted due to a test failure.
This CL fixes the test failure

Bug: 381303924
Test: manual
Flag: EXEMPT n/a
Change-Id: I44bc8be167875b9ee05d8691361e1b8a3026e625
parent 5f9197e6

AconfigFlags.bp

+11 −0
Original line number Diff line number Diff line
@@ -1218,6 +1218,17 @@ java_aconfig_library { 
    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



java_aconfig_library {

    name: "device_policy_aconfig_flags_java_export",

    aconfig_declarations: "device_policy_aconfig_flags",

    defaults: ["framework-minus-apex-aconfig-java-defaults"],

    min_sdk_version: "30",

    apex_available: [

        "//apex_available:platform",

        "com.android.permission",

    ],

}



java_aconfig_library {

    name: "device_policy_aconfig_flags_lib_host",

    aconfig_declarations: "device_policy_aconfig_flags",

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

+1 −0
Original line number Diff line number Diff line
@@ -388,6 +388,7 @@ flag { 


flag {

  name: "split_create_managed_profile_enabled"

  is_exported: true

  namespace: "enterprise"

  description: "Split up existing create and provision managed profile API."

  bug: "375382324"