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

Commit 4a497f8d authored by Lorenzo Colitti's avatar Lorenzo Colitti Committed by Automerger Merge Worker
Browse files

Merge "Add NET_CAPABILITY_NOT_VCN_MANAGED to ConstantsShim." am: 01cd6430 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/1611753

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icb9da1bad18c303c22249362cfdf17e58663943f
parents dbcc6c2f 01cd6430

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;



}