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

Commit 7f705fb8 authored by Chiachang Wang's avatar Chiachang Wang Committed by Automerger Merge Worker
Browse files

Merge "Support NetworkRequest.Builder with an existing request in shim" am:... 

Merge "Support NetworkRequest.Builder with an existing request in shim" am: 230d5ae6 am: 78a2f053

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

Change-Id: I98bd48ecfca7989a1130040551ce1433e0db2ef4
parents 1594a3ca 78a2f053

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

+7 −0
Original line number Original line Diff line number Diff line
@@ -22,6 +22,7 @@ import android.util.Range; 




import androidx.annotation.NonNull;

import androidx.annotation.NonNull;

import androidx.annotation.Nullable;

import androidx.annotation.Nullable;

import androidx.annotation.RequiresApi;





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

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

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

import com.android.networkstack.apishim.common.ShimUtils;
@@ -53,4 +54,10 @@ public class NetworkRequestShimImpl 
            @Nullable Set<Range<Integer>> uids) {

            @Nullable Set<Range<Integer>> uids) {

        builder.setUids(uids);

        builder.setUids(uids);

    }

    }



    @RequiresApi(Build.VERSION_CODES.S)

    @Override

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

        return new NetworkRequest.Builder(request);

    }

}
 
}

apishim/common/com/android/networkstack/apishim/common/NetworkRequestShim.java

+10 −0
Original line number Original line Diff line number Diff line
@@ -35,4 +35,14 @@ public interface NetworkRequestShim { 
     */

     */

    void setUids(@NonNull NetworkRequest.Builder builder,

    void setUids(@NonNull NetworkRequest.Builder builder,

            @Nullable Set<Range<Integer>> uids) throws UnsupportedApiLevelException;

            @Nullable Set<Range<Integer>> uids) throws UnsupportedApiLevelException;



    /**

     * See android.net.NetworkRequest.Builder(NetworkRequest).

     * @throws UnsupportedApiLevelException if API is not available in the API level.

     */

    default NetworkRequest.Builder newBuilder(@NonNull NetworkRequest request)

            throws UnsupportedApiLevelException {

        // Not supported before API 31.

        throw new UnsupportedApiLevelException("Not supported before API 31.");

    }

}
 
}