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

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

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

parents dcad040a 9b29f402

AconfigFlags.bp

+0 −13
Original line number Diff line number Diff line
@@ -1207,7 +1207,6 @@ 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",

    ],
@@ -1219,18 +1218,6 @@ 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

+0 −1
Original line number Diff line number Diff line
@@ -388,7 +388,6 @@ 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"