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

Commit 07fad9a1 authored by junyulai's avatar junyulai Committed by Automerger Merge Worker
Browse files

[VCN11.1] Update API shims for requestBackgroundNetwork am: f86d05ff am: 8627524c 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I873876f276f9b41eae43b03b6ce5d9717f8c634d
parents ff70e0cf 8627524c

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

+1 −2
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ import android.net.NetworkRequest; 
import android.os.Handler;



import androidx.annotation.NonNull;

import androidx.annotation.Nullable;



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

import com.android.networkstack.apishim.common.UnsupportedApiLevelException;
@@ -45,7 +44,7 @@ public class ConnectivityManagerShimImpl implements ConnectivityManagerShim { 
     */

    @Override

    public void requestBackgroundNetwork(@NonNull NetworkRequest request,

            @Nullable Handler handler, @NonNull NetworkCallback networkCallback)

            @NonNull Handler handler, @NonNull NetworkCallback networkCallback)

            throws UnsupportedApiLevelException {

        // Not supported for API 29.

        throw new UnsupportedApiLevelException("Not supported in API 29.");

apishim/30/com/android/networkstack/apishim/api30/ConnectivityManagerShimImpl.java

+1 −2
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ import android.os.Build; 
import android.os.Handler;



import androidx.annotation.NonNull;

import androidx.annotation.Nullable;



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

import com.android.networkstack.apishim.common.ShimUtils;
@@ -55,7 +54,7 @@ public class ConnectivityManagerShimImpl 
     */

    @Override

    public void requestBackgroundNetwork(@NonNull NetworkRequest request,

            @Nullable Handler handler, @NonNull NetworkCallback networkCallback)

            @NonNull Handler handler, @NonNull NetworkCallback networkCallback)

            throws UnsupportedApiLevelException {

        // Not supported for API 30.

        throw new UnsupportedApiLevelException("Not supported in API 30.");

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

+1 −2
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ import android.os.Build; 
import android.os.Handler;



import androidx.annotation.NonNull;

import androidx.annotation.Nullable;



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

import com.android.networkstack.apishim.common.ShimUtils;
@@ -57,7 +56,7 @@ public class ConnectivityManagerShimImpl 
     */

    @Override

    public void requestBackgroundNetwork(@NonNull NetworkRequest request,

            @Nullable Handler handler, @NonNull NetworkCallback networkCallback) {

            @NonNull Handler handler, @NonNull NetworkCallback networkCallback) {

        mCm.requestBackgroundNetwork(request, handler, networkCallback);

    }

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

+1 −3
Original line number Diff line number Diff line
@@ -21,8 +21,6 @@ import android.net.NetworkRequest; 
import android.os.Handler;



import androidx.annotation.NonNull;

import androidx.annotation.Nullable;





/**

 * Interface used to access API methods in {@link android.net.ConnectivityManager}, with
@@ -36,7 +34,7 @@ import androidx.annotation.Nullable; 
public interface ConnectivityManagerShim {

    /** See android.net.ConnectivityManager#requestBackgroundNetwork */

    void requestBackgroundNetwork(@NonNull NetworkRequest request,

            @Nullable Handler handler, @NonNull NetworkCallback networkCallback)

            @NonNull Handler handler, @NonNull NetworkCallback networkCallback)

            throws UnsupportedApiLevelException;



    /** See android.net.ConnectivityManager#registerSystemDefaultNetworkCallback */