Snap for 7272189 from 28a07b8c42c04b41c8dd7bf69a58dd7dffa223ee to mainline-media-swcodec-release Change-Id: I6335529af1171357d322a2190678a9ccc50f9be0

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);
+    }
 }

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");
+    }
 }