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

Commit 1b51b753 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 b7da058a 9505d8b6

AconfigFlags.bp

+11 −0
Original line number Diff line number Diff line
@@ -1219,6 +1219,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
@@ -398,6 +398,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"