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

Commit a53b943b authored by Alex Johnston's avatar Alex Johnston Committed by Android (Google) Code Review
Browse files

Merge "Allow admin flags to be used in PermissionController" into main

parents 27477f79 32d5fd10

AconfigFlags.bp

+13 −0
Original line number Diff line number Diff line
@@ -1205,6 +1205,7 @@ aconfig_declarations { 
    name: "device_policy_aconfig_flags",

    package: "android.app.admin.flags",

    container: "system",

    exportable: true,

    srcs: [

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

    ],
@@ -1216,6 +1217,18 @@ 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"],

    mode: "exported",

    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
@@ -387,6 +387,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"