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

Commit 796ba4b3 authored by Lorenzo Colitti's avatar Lorenzo Colitti Committed by Android (Google) Code Review
Browse files

Merge "Add a shim for setIncludeOtherUidNetworks." into sc-dev

parents 187e948e 07f58fde

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

+7 −0
Original line number Diff line number Diff line
@@ -57,6 +57,13 @@ public class NetworkRequestShimImpl 
        builder.setUids(uids);

    }



    @Override

    public NetworkRequest.Builder setIncludeOtherUidNetworks(NetworkRequest.Builder builder,

            boolean include) {

        builder.setIncludeOtherUidNetworks(include);

        return builder;

    }



    @Override

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

        return new NetworkRequest.Builder(request);

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

+8 −0
Original line number Diff line number Diff line
@@ -36,6 +36,14 @@ public interface NetworkRequestShim { 
    void setUids(@NonNull NetworkRequest.Builder builder,

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



    /**

     * See android.net.NetworkRequest.Builder#setIncludeOtherUidNetworks.

     */

    default NetworkRequest.Builder setIncludeOtherUidNetworks(NetworkRequest.Builder builder,

            boolean include) throws UnsupportedApiLevelException {

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

    }



    /**

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

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