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

Commit 38d0c60e authored by Chiachang Wang's avatar Chiachang Wang Committed by Automerger Merge Worker
Browse files

Merge "Annotate @RequiresApi for S to class level" am: d4f01713 am:... 

Merge "Annotate @RequiresApi for S to class level" am: d4f01713 am: 7c0777eb am: 81691520 am: 0acb3014

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

Change-Id: Ic0e2a2660edf6576955b1df7b0d1fddf00697a35
parents 26bf13bc 0acb3014

Android.bp

+3 −0
Original line number Diff line number Diff line
@@ -65,6 +65,9 @@ java_defaults { 
        "androidx.annotation_annotation",

        "networkstack-client",

    ],

    static_libs : [

        "modules-utils-build_system"

    ],

    apex_available: [

        "com.android.tethering",

        "//apex_available:platform",  // For InProcessNetworkStack and InProcessTethering

apishim/31/com/android/networkstack/apishim/ConnectivityManagerShimImpl.java

+6 −2
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


package com.android.networkstack.apishim;



import static com.android.modules.utils.build.SdkLevel.isAtLeastS;



import android.content.Context;

import android.net.ConnectivityManager;

import android.net.ConnectivityManager.NetworkCallback;
@@ -25,15 +27,16 @@ import android.os.Handler; 
import android.util.Range;



import androidx.annotation.NonNull;

import androidx.annotation.RequiresApi;



import com.android.networkstack.apishim.common.ConnectivityManagerShim;

import com.android.networkstack.apishim.common.ShimUtils;



import java.util.Collection;



/**

 * Implementation of {@link ConnectivityManagerShim} for API 31.

 */

@RequiresApi(Build.VERSION_CODES.S)

public class ConnectivityManagerShimImpl

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

    private final ConnectivityManager mCm;
@@ -46,8 +49,9 @@ public class ConnectivityManagerShimImpl 
    /**

     * Get a new instance of {@link ConnectivityManagerShim}.

     */

    @RequiresApi(Build.VERSION_CODES.Q)

    public static ConnectivityManagerShim newInstance(Context context) {

        if (!ShimUtils.isReleaseOrDevelopmentApiAbove(Build.VERSION_CODES.R)) {

        if (!isAtLeastS()) {

            return com.android.networkstack.apishim.api30.ConnectivityManagerShimImpl

                    .newInstance(context);

        }

apishim/31/com/android/networkstack/apishim/NetworkRequestShimImpl.java

+6 −5
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


package com.android.networkstack.apishim;



import static com.android.modules.utils.build.SdkLevel.isAtLeastS;



import android.net.NetworkRequest;

import android.os.Build;

import android.util.Range;
@@ -25,13 +27,13 @@ import androidx.annotation.Nullable; 
import androidx.annotation.RequiresApi;



import com.android.networkstack.apishim.common.NetworkRequestShim;

import com.android.networkstack.apishim.common.ShimUtils;



import java.util.Set;



/**

 * Implementation of {@link NetworkRequestShim} for API 31.

 */

@RequiresApi(Build.VERSION_CODES.S)

public class NetworkRequestShimImpl

        extends com.android.networkstack.apishim.api30.NetworkRequestShimImpl {

    protected NetworkRequestShimImpl() {
@@ -41,10 +43,10 @@ public class NetworkRequestShimImpl 
    /**

     * Get a new instance of {@link NetworkRequestShim}.

     */

    @RequiresApi(Build.VERSION_CODES.Q)

    public static NetworkRequestShim newInstance() {

        if (!ShimUtils.isReleaseOrDevelopmentApiAbove(Build.VERSION_CODES.R)) {

            return com.android.networkstack.apishim.api30.NetworkRequestShimImpl

                    .newInstance();

        if (!isAtLeastS()) {

            return com.android.networkstack.apishim.api30.NetworkRequestShimImpl.newInstance();

        }

        return new NetworkRequestShimImpl();

    }
@@ -55,7 +57,6 @@ public class NetworkRequestShimImpl 
        builder.setUids(uids);

    }



    @RequiresApi(Build.VERSION_CODES.S)

    @Override

    public NetworkRequest.Builder newBuilder(@NonNull NetworkRequest request) {

        return new NetworkRequest.Builder(request);

jarjar-rules-shared.txt

+3 −0
Original line number Diff line number Diff line
@@ -11,3 +11,6 @@ rule android.net.DhcpResults* android.net.networkstack.DhcpResults@1 
rule android.util.LocalLog* android.net.networkstack.util.LocalLog@1



rule android.util.IndentingPrintWriter* android.net.networkstack.util.AndroidUtilIndentingPrintWriter@1



# Classes from modules-utils-build_system

rule com.android.modules.utils.build.** com.android.networkstack.utils.build.@1
 
 No newline at end of file