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

Commit 3b90d159 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add NET_CAPABILITY_NOT_VCN_MANAGED to ConstantsShim." into mainline-prod

parents d2e7e247 e2edb34f

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;



}