Merge "[VCN20.1] Change requestBackgroundNetwork argument order"
diff --git a/apishim/29/com/android/networkstack/apishim/api29/ConnectivityManagerShimImpl.java b/apishim/29/com/android/networkstack/apishim/api29/ConnectivityManagerShimImpl.java
index 3c13a56..2ac25af 100644
--- a/apishim/29/com/android/networkstack/apishim/api29/ConnectivityManagerShimImpl.java
+++ b/apishim/29/com/android/networkstack/apishim/api29/ConnectivityManagerShimImpl.java
@@ -44,7 +44,7 @@
*/
@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.");
diff --git a/apishim/30/com/android/networkstack/apishim/api30/ConnectivityManagerShimImpl.java b/apishim/30/com/android/networkstack/apishim/api30/ConnectivityManagerShimImpl.java
index c1e3561..1de6610 100644
--- a/apishim/30/com/android/networkstack/apishim/api30/ConnectivityManagerShimImpl.java
+++ b/apishim/30/com/android/networkstack/apishim/api30/ConnectivityManagerShimImpl.java
@@ -54,7 +54,7 @@
*/
@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.");
diff --git a/apishim/31/com/android/networkstack/apishim/ConnectivityManagerShimImpl.java b/apishim/31/com/android/networkstack/apishim/ConnectivityManagerShimImpl.java
index 2f4b955..7383d6f 100644
--- a/apishim/31/com/android/networkstack/apishim/ConnectivityManagerShimImpl.java
+++ b/apishim/31/com/android/networkstack/apishim/ConnectivityManagerShimImpl.java
@@ -59,8 +59,8 @@
*/
@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);
}
/**
diff --git a/apishim/common/com/android/networkstack/apishim/common/ConnectivityManagerShim.java b/apishim/common/com/android/networkstack/apishim/common/ConnectivityManagerShim.java
index 4a1e183..971e500 100644
--- a/apishim/common/com/android/networkstack/apishim/common/ConnectivityManagerShim.java
+++ b/apishim/common/com/android/networkstack/apishim/common/ConnectivityManagerShim.java
@@ -37,7 +37,7 @@
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 */