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

Commit 0c36412a authored by Lorenzo Colitti's avatar Lorenzo Colitti
Browse files

Add a VERSION constant to the NetworkStack shims. 

This is useful for tests, in particular to ensure that tests
do not fail when compiled against a version of the shims that
does not support the functionality they are testing.

Test: m
Bug: 152723363
Merged-In: I44fa537d792ccc205e54e3be460a90994a47c52e
Change-Id: I44fa537d792ccc205e54e3be460a90994a47c52e
parent 1b4d196a

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

+11 −0
Original line number Diff line number Diff line
@@ -16,10 +16,21 @@ 


package com.android.networkstack.apishim.api29;



import androidx.annotation.VisibleForTesting;



/**

 * Utility class for defining and importing constants from the Android platform.

 */

public class ConstantsShim {

    /**

     * Constant that callers can use to determine what version of the shim they are using.

     * Must be the same as the version of the shims.

     * This should only be used by test code. Production code that uses the shims should be using

     * the shimmed objects and methods themselves.

     */

    @VisibleForTesting

    public static final int VERSION = 29;



    // Constants defined in android.net.ConnectivityDiagnosticsManager.

    public static final int DETECTION_METHOD_DNS_EVENTS = 1;

    public static final int DETECTION_METHOD_TCP_METRICS = 2;

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

+11 −0
Original line number Diff line number Diff line
@@ -19,10 +19,21 @@ package com.android.networkstack.apishim; 
import static android.net.ConnectivityDiagnosticsManager.ConnectivityReport;

import static android.net.ConnectivityDiagnosticsManager.DataStallReport;



import androidx.annotation.VisibleForTesting;



/**

 * Utility class for defining and importing constants from the Android platform.

 */

public class ConstantsShim extends com.android.networkstack.apishim.api29.ConstantsShim {

    /**

     * Constant that callers can use to determine what version of the shim they are using.

     * Must be the same as the version of the shims.

     * This should only be used by test code. Production code that uses the shims should be using

     * the shimmed objects and methods themselves.

     */

    @VisibleForTesting

    public static final int VERSION = 30;



    public static final int DETECTION_METHOD_DNS_EVENTS =

            DataStallReport.DETECTION_METHOD_DNS_EVENTS;

    public static final int DETECTION_METHOD_TCP_METRICS =