diff options
| author | 2024-08-29 09:17:15 +0000 | |
|---|---|---|
| committer | 2024-08-29 09:17:15 +0000 | |
| commit | a3c982cc6cbff37e7f45d0c9f04fb174cd67d695 (patch) | |
| tree | c402fb6846866bf909c41bc8c99eba95777fe0c3 | |
| parent | 0bda560523392d3a97177c0b289d4d7b4374e33f (diff) | |
| parent | 1ddffd76cf0f1f048c2620c7105ec0a9b60eb56f (diff) | |
Merge "Allow VDM flags to be used in PermissionController" into main
| -rw-r--r-- | AconfigFlags.bp | 13 | ||||
| -rw-r--r-- | core/java/android/companion/virtual/flags/flags.aconfig | 1 |
2 files changed, 14 insertions, 0 deletions
diff --git a/AconfigFlags.bp b/AconfigFlags.bp index edb119e0afb1..6f8a189c42b8 100644 --- a/AconfigFlags.bp +++ b/AconfigFlags.bp @@ -438,10 +438,23 @@ aconfig_declarations { name: "android.companion.virtualdevice.flags-aconfig", package: "android.companion.virtualdevice.flags", container: "system", + exportable: true, srcs: ["core/java/android/companion/virtual/flags/*.aconfig"], } java_aconfig_library { + name: "android.companion.virtualdevice.flags-aconfig-java-export", + aconfig_declarations: "android.companion.virtualdevice.flags-aconfig", + 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: "android.companion.virtual.flags-aconfig-java", aconfig_declarations: "android.companion.virtual.flags-aconfig", defaults: ["framework-minus-apex-aconfig-java-defaults"], diff --git a/core/java/android/companion/virtual/flags/flags.aconfig b/core/java/android/companion/virtual/flags/flags.aconfig index b4c36e1bc513..22a9ccf425c2 100644 --- a/core/java/android/companion/virtual/flags/flags.aconfig +++ b/core/java/android/companion/virtual/flags/flags.aconfig @@ -50,6 +50,7 @@ flag { name: "activity_control_api" description: "Enable APIs for fine grained activity policy, fallback and callbacks" bug: "333443509" + is_exported: true } flag { |