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

Commit e2edb34f authored by Lorenzo Colitti's avatar Lorenzo Colitti
Browse files

Add NET_CAPABILITY_NOT_VCN_MANAGED to ConstantsShim. 

This is new in S.

The Merged-In tag in this CL is from aosp/1605016, which is an
arbitrary CL that is already in sc-dev, with the purpose of
preventing this CL from reaching sc-dev.

Bug: 167645754
Ignore-AOSP-First: need to fix build
Test: m NetworkStack CtsNetTestCasesLatestSdk CtsHostsideNetworkTests CtsHostsideNetworkTestsApp
Change-Id: I941024a1661a66794e97e8f2b0e992f83f673bf4
Merged-In: I2ec0aa737804cc3ea5fce9326f84c1e4b5e4972c
parent 2ee5926a

apishim/29/com/android/networkstack/apishim/api29/ConstantsShim.java

+4 −0
Original line number Diff line number Diff line
@@ -38,4 +38,8 @@ public class ConstantsShim { 
    // Constants defined in android.net.CaptivePortalData.

    public static final int CAPTIVE_PORTAL_DATA_SOURCE_OTHER = 0;

    public static final int CAPTIVE_PORTAL_DATA_SOURCE_PASSPOINT = 1;



    // Constants defined in android.net.NetworkCapabilities.

    public static final int NET_CAPABILITY_NOT_VCN_MANAGED = 28;



}

apishim/30/com/android/networkstack/apishim/api30/ConstantsShim.java

+3 −3
Original line number Diff line number Diff line
@@ -38,8 +38,8 @@ public class ConstantsShim extends com.android.networkstack.apishim.api29.Consta 
    public static final int DETECTION_METHOD_TCP_METRICS =

            DataStallReport.DETECTION_METHOD_TCP_METRICS;



    /**

     * @see android.net.NetworkCapabilities

     */

    // Constants defined in android.net.NetworkCapabilities.

    public static final int NET_CAPABILITY_NOT_VCN_MANAGED = 28;

    public static final int TRANSPORT_TEST = 7;



}