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

Commit 9dee53ba authored by Chiachang Wang's avatar Chiachang Wang
Browse files

Update "current" shim library for next development SDK 

Modules do not have shim requirement in SDK 32. For those
targeting for TIRAMISU. The required shim should be SDK
33, so update the current shim library to 33 shims to replace
unused 32 shims.

Test: m
Test: atest NetworkStackTests NetworkStackNextTests \
CtsNetTestCasesLatestSdk
Test: update-apex-allowed-deps.sh

Change-Id: Iaf53230fcbf2ddaaa7568a873a5db16fa5030b45
parent 4fa3ef2c

Android.bp

+3 −3
Original line number Diff line number Diff line
@@ -158,10 +158,10 @@ java_library { 
// stable and have no defined version number. These could be called 10000, but they use the next

// integer so if the next SDK release happens to use that integer, we don't need to rename them.

java_library {

    name: "NetworkStackApi32Shims",

    name: "NetworkStackApi33Shims",

    defaults: ["NetworkStackShimsDefaults"],

    srcs: [

        "apishim/32/**/*.java",

        "apishim/33/**/*.java",

    ],

    libs: [

        "NetworkStackShimsCommon",
@@ -185,7 +185,7 @@ java_library { 
        "NetworkStackApi29Shims",

        "NetworkStackApi30Shims",

        "NetworkStackApi31Shims",

        "NetworkStackApi32Shims",

        "NetworkStackApi33Shims",

    ],

    sdk_version: "module_current",

    visibility: [

apishim/32/com/android/networkstack/apishim/CaptivePortalDataShimImpl.java→apishim/33/com/android/networkstack/apishim/CaptivePortalDataShimImpl.java

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ import com.android.networkstack.apishim.common.CaptivePortalDataShim; 
/**

 * Compatibility implementation of {@link CaptivePortalDataShim}.

 */

@RequiresApi(Build.VERSION_CODES.S) // Change to T when version code available, and adding T methods

@RequiresApi(Build.VERSION_CODES.TIRAMISU)

public class CaptivePortalDataShimImpl

        extends com.android.networkstack.apishim.api31.CaptivePortalDataShimImpl {

    // Currently identical to the API 31 shim, so inherit everything

apishim/32/com/android/networkstack/apishim/ConnectivityManagerShimImpl.java→apishim/33/com/android/networkstack/apishim/ConnectivityManagerShimImpl.java

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ import com.android.networkstack.apishim.common.ConnectivityManagerShim; 
/**

 * Compatibility implementation of {@link ConnectivityManagerShim}.

 */

@RequiresApi(Build.VERSION_CODES.S) // Change to T when version code available, and adding T methods

@RequiresApi(Build.VERSION_CODES.TIRAMISU)

public class ConnectivityManagerShimImpl

        extends com.android.networkstack.apishim.api31.ConnectivityManagerShimImpl  {

    // Currently identical to the API 31 shim, so inherit everything

apishim/32/com/android/networkstack/apishim/ConstantsShim.java→apishim/33/com/android/networkstack/apishim/ConstantsShim.java

+1 −1
Original line number Diff line number Diff line
@@ -29,5 +29,5 @@ public class ConstantsShim extends com.android.networkstack.apishim.api31.Consta 
     * the shimmed objects and methods themselves.

     */

    @VisibleForTesting

    public static final int VERSION = 32;

    public static final int VERSION = 33;

}

apishim/32/com/android/networkstack/apishim/NetworkInformationShimImpl.java→apishim/33/com/android/networkstack/apishim/NetworkInformationShimImpl.java

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ import com.android.networkstack.apishim.common.NetworkInformationShim; 
/**

 * Compatibility implementation of {@link NetworkInformationShim}.

 */

@RequiresApi(Build.VERSION_CODES.S) // Change to T when version code available, and adding T methods

@RequiresApi(Build.VERSION_CODES.TIRAMISU)

public class NetworkInformationShimImpl

        extends com.android.networkstack.apishim.api31.NetworkInformationShimImpl {

    // Currently identical to the API 31 shim, so inherit everything