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

Commit 04dd1160 authored by Junyu Lai's avatar Junyu Lai Committed by Automerger Merge Worker
Browse files

Merge "[VCN20.1] Change requestBackgroundNetwork argument order" am: 0ef9f63b 

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

Change-Id: I0de9819b11fb1b06b301abea890ad5743366acfc
parents 9da8600b 0ef9f63b

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

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ public class ConnectivityManagerShimImpl implements ConnectivityManagerShim { 
     */

    @Override

    public void requestBackgroundNetwork(@NonNull NetworkRequest request,

            @NonNull Handler handler, @NonNull NetworkCallback networkCallback)

            @NonNull NetworkCallback networkCallback, @NonNull Handler handler)

            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 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ public class ConnectivityManagerShimImpl 
     */

    @Override

    public void requestBackgroundNetwork(@NonNull NetworkRequest request,

            @NonNull Handler handler, @NonNull NetworkCallback networkCallback)

            @NonNull NetworkCallback networkCallback, @NonNull Handler handler)

            throws UnsupportedApiLevelException {

        // Not supported for API 30.

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

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

+2 −2
Original line number Diff line number Diff line
@@ -59,8 +59,8 @@ public class ConnectivityManagerShimImpl 
     */

    @Override

    public void requestBackgroundNetwork(@NonNull NetworkRequest request,

            @NonNull Handler handler, @NonNull NetworkCallback networkCallback) {

        mCm.requestBackgroundNetwork(request, handler, networkCallback);

            @NonNull NetworkCallback networkCallback, @NonNull Handler handler) {

        mCm.requestBackgroundNetwork(request, networkCallback, handler);

    }



    /**

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

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ import java.util.Collection; 
public interface ConnectivityManagerShim {

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

    void requestBackgroundNetwork(@NonNull NetworkRequest request,

            @NonNull Handler handler, @NonNull NetworkCallback networkCallback)

            @NonNull NetworkCallback networkCallback, @NonNull Handler handler)

            throws UnsupportedApiLevelException;



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