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

Commit 63b9a2ff authored by Vladimir Komsiyski's avatar Vladimir Komsiyski
Browse files

Organize VDM flags better 

 - Move the deprecated namespace flags to flags/ and make it clear that
   this should not be modified
 - Split the new namespace flags to launched and non-launched for easier
   tracking

#codehealth

Bug: 379646558
Test: presubmit
Flag: EXEMPT no-op cleanup

Change-Id: Ib8dd6b110d9a7fb821b34b4beb2ca49679882664
parent 507bb3be

AconfigFlags.bp

+7 −4
Original line number Diff line number Diff line
@@ -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",

    ],

}

core/java/android/companion/virtual/flags.aconfig→core/java/android/companion/virtual/flags/deprecated_flags_do_not_edit.aconfig

+7 −5
Original line number Diff line number Diff line 
# 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"

core/java/android/companion/virtual/flags/flags.aconfig

+6 −12
Original line number Diff line number Diff line 
# 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"

core/java/android/companion/virtual/flags/launched_flags.aconfig

0 → 100644
+6 −0
Original line number Diff line number Diff line 
# 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"