diff options
| -rw-r--r-- | AconfigFlags.bp | 11 | ||||
| -rw-r--r-- | core/java/android/companion/virtual/flags/deprecated_flags_do_not_edit.aconfig (renamed from core/java/android/companion/virtual/flags.aconfig) | 12 | ||||
| -rw-r--r-- | core/java/android/companion/virtual/flags/flags.aconfig | 18 | ||||
| -rw-r--r-- | core/java/android/companion/virtual/flags/launched_flags.aconfig | 6 |
4 files changed, 26 insertions, 21 deletions
diff --git a/AconfigFlags.bp b/AconfigFlags.bp index b1c091bfa946..a60ced5835ea 100644 --- a/AconfigFlags.bp +++ b/AconfigFlags.bp @@ -65,13 +65,13 @@ aconfig_declarations_group { "android.sdk.flags-aconfig-java", "android.security.flags-aconfig-java", "android.server.app.flags-aconfig-java", + "android.service.appprediction.flags-aconfig-java", "android.service.autofill.flags-aconfig-java", "android.service.chooser.flags-aconfig-java", "android.service.compat.flags-aconfig-java", "android.service.controls.flags-aconfig-java", "android.service.dreams.flags-aconfig-java", "android.service.notification.flags-aconfig-java", - "android.service.appprediction.flags-aconfig-java", "android.service.quickaccesswallet.flags-aconfig-java", "android.service.voice.flags-aconfig-java", "android.speech.flags-aconfig-java", @@ -523,7 +523,10 @@ aconfig_declarations { package: "android.companion.virtualdevice.flags", container: "system", exportable: true, - srcs: ["core/java/android/companion/virtual/flags/*.aconfig"], + srcs: [ + "core/java/android/companion/virtual/flags/flags.aconfig", + "core/java/android/companion/virtual/flags/launched_flags.aconfig", + ], } java_aconfig_library { @@ -548,7 +551,7 @@ aconfig_declarations { name: "android.companion.virtual.flags-aconfig", package: "android.companion.virtual.flags", container: "system", - srcs: ["core/java/android/companion/virtual/*.aconfig"], + srcs: ["core/java/android/companion/virtual/flags/deprecated_flags_do_not_edit.aconfig"], } // InputMethod @@ -828,8 +831,8 @@ java_aconfig_library { min_sdk_version: "30", apex_available: [ "//apex_available:platform", - "com.android.permission", "com.android.nfcservices", + "com.android.permission", ], } diff --git a/core/java/android/companion/virtual/flags.aconfig b/core/java/android/companion/virtual/flags/deprecated_flags_do_not_edit.aconfig index f31e7d4c61cd..eae50624539e 100644 --- a/core/java/android/companion/virtual/flags.aconfig +++ b/core/java/android/companion/virtual/flags/deprecated_flags_do_not_edit.aconfig @@ -1,11 +1,13 @@ -# Do not add new flags to this file. +# Do not modify this file. # -# Due to "virtual" keyword in the package name flags -# added to this file cannot be accessed from C++ -# code. +# Due to "virtual" keyword in the package name flags added to this file cannot +# be accessed from C++ code. # # Use frameworks/base/core/java/android/companion/virtual/flags/flags.aconfig -# instead. +# instead for new flags. +# +# All of the remaining flags here have been used for API flagging and are +# therefore exported and should not be deleted. package: "android.companion.virtual.flags" container: "system" diff --git a/core/java/android/companion/virtual/flags/flags.aconfig b/core/java/android/companion/virtual/flags/flags.aconfig index de01280f293f..84af84072f1b 100644 --- a/core/java/android/companion/virtual/flags/flags.aconfig +++ b/core/java/android/companion/virtual/flags/flags.aconfig @@ -1,17 +1,11 @@ +# VirtualDeviceManager flags # -# Copyright (C) 2023 The Android Open Source Project +# This file contains flags guarding features that are in development. # -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. +# Once a flag is launched or abandoned and there are no more references to it in +# the codebase, it should be either: +# - deleted, or +# - moved to launched_flags.aconfig if it was launched and used for API flagging. package: "android.companion.virtualdevice.flags" container: "system" diff --git a/core/java/android/companion/virtual/flags/launched_flags.aconfig b/core/java/android/companion/virtual/flags/launched_flags.aconfig new file mode 100644 index 000000000000..ee896319bb72 --- /dev/null +++ b/core/java/android/companion/virtual/flags/launched_flags.aconfig @@ -0,0 +1,6 @@ +# This file contains the launched VirtualDeviceManager flags from the +# "android.companion.virtualdevice.flags" package that cannot be deleted because +# they have been used for API flagging. + +package: "android.companion.virtualdevice.flags" +container: "system" |