commit 83a64b862b85e8f962a960e764a1a0f6e2e93c29
author Lorenzo Colitti <lorenzo@google.com> Thu Apr 08 12:48:59 2021 +0900
committer Lorenzo Colitti <lorenzo@google.com> Thu Apr 08 16:01:28 2021 +0900
tree b3a75a72130186abb3fd1cfb208ccbd5fb4efd89
parent b0b2e6aa67c28709a5956c43e037f9de7aa40a20

Add a shim for registerDefaultNetworkCallbackAsUid.

Bug: 165835257
Test: CTS test CL in same topic.
Change-Id: I4c6f2182f848ae10ddaf9e83d72a293ee249f0c4

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

diff --git a/apishim/31/com/android/networkstack/apishim/ConnectivityManagerShimImpl.java b/apishim/31/com/android/networkstack/apishim/ConnectivityManagerShimImpl.java
index a62a9db..8d617f7 100644
--- a/apishim/31/com/android/networkstack/apishim/ConnectivityManagerShimImpl.java
+++ b/apishim/31/com/android/networkstack/apishim/ConnectivityManagerShimImpl.java
@@ -68,4 +68,13 @@
             @NonNull NetworkCallback networkCallback, @NonNull Handler handler) {
         mCm.registerSystemDefaultNetworkCallback(networkCallback, handler);
     }
+
+    /**
+     * See android.net.ConnectivityManager#registerDefaultNetworkCallbackAsUid
+     */
+    @Override
+    public void registerDefaultNetworkCallbackAsUid(
+            int uid, @NonNull NetworkCallback networkCallback, @NonNull Handler handler) {
+        mCm.registerDefaultNetworkCallbackAsUid(uid, networkCallback, handler);
+    }
 }

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

diff --git a/apishim/common/com/android/networkstack/apishim/common/ConnectivityManagerShim.java b/apishim/common/com/android/networkstack/apishim/common/ConnectivityManagerShim.java
index beb5f1d..bd29f16 100644
--- a/apishim/common/com/android/networkstack/apishim/common/ConnectivityManagerShim.java
+++ b/apishim/common/com/android/networkstack/apishim/common/ConnectivityManagerShim.java
@@ -41,4 +41,11 @@
     void registerSystemDefaultNetworkCallback(
             @NonNull NetworkCallback networkCallback, @NonNull Handler handler)
             throws UnsupportedApiLevelException;
+
+    /** See android.net.ConnectivityManager#registerDefaultNetworkCallbackAsUid */
+    default void registerDefaultNetworkCallbackAsUid(
+            int uid, @NonNull NetworkCallback networkCallback, @NonNull Handler handler)
+            throws UnsupportedApiLevelException {
+        throw new UnsupportedApiLevelException("Only supported starting from API 31");
+    }
 }