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

Commit c2bd3bd3 authored by Yan Yan's avatar Yan Yan
Browse files

Change VCN flag container to tethering 

VCN will be moved to Tetherig module eventually. This patch updates
the VCN flag host container to the module and updates the framework.jar
to access the flags via "exported" mode.

Followup CLs will move VCN to a seperate java_sdk_library and the
aconfig lib will be removed from
framework-minus-apex-aconfig-declarations and moved to that
java_sdk_library. A build system flag will control whether the VCN
will be in platform or the tethering module.

Bug: 376339506
Test: presubmit
Flag: EXEMPT flag container value change
Change-Id: I0434abce40dbadeec20f373f46484c41a08947ff
parent c864e8d1

AconfigFlags.bp

+8 −3
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ aconfig_declarations_group { 
        "android.media.tv.flags-aconfig-java",

        "android.multiuser.flags-aconfig-java",

        "android.net.platform.flags-aconfig-java",

        "android.net.vcn.flags-aconfig-java",

        "android.net.vcn.flags-aconfig-java-export",

        "android.net.wifi.flags-aconfig-java",

        "android.nfc.flags-aconfig-java",

        "android.os.flags-aconfig-java",
@@ -1061,16 +1061,21 @@ java_aconfig_library { 
}



// VCN

// TODO:376339506 Move the VCN code, the flag declaration and

// java_aconfig_library to framework-connectivity-b

aconfig_declarations {

    name: "android.net.vcn.flags-aconfig",

    package: "android.net.vcn",

    container: "system",

    container: "com.android.tethering",

    exportable: true,

    srcs: ["core/java/android/net/vcn/*.aconfig"],

}



java_aconfig_library {

    name: "android.net.vcn.flags-aconfig-java",

    name: "android.net.vcn.flags-aconfig-java-export",

    aconfig_declarations: "android.net.vcn.flags-aconfig",

    mode: "exported",

    min_sdk_version: "35",

    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}

core/java/android/net/vcn/flags.aconfig

+1 −1
Original line number Diff line number Diff line 
package: "android.net.vcn"

container: "system"

container: "com.android.tethering"



flag {

    name: "safe_mode_config"