commit 4ef475f2873ed678a6dbb208be3fabe80e6387d5
author Chiachang Wang <chiachangwang@google.com> Tue Apr 20 16:33:33 2021 +0800
committer Chiachang Wang <chiachangwang@google.com> Tue Apr 20 09:34:52 2021 +0000
tree 8346757ab676bc87bf377f347738f77e3155d089
parent 8dac8044b3afacb8122a5092e6fbd4eeaee2d40b

Update shim method to the updated API name

Rename ConnectiivityManager.registerDefaultNetworkCallbackAsUid
to registerDefaultNetworkCallbackForUid as the feedback from
API review. Update the usage in shim correspondingly.

Bug: 185246410
Test: atest FrameworksNetTests
Test: atest CtsNetTestCasesLatestSdk
Change-Id: I3a8b5020d0bd1c95e3a75910322301b5596be823
Ignore-AOSP-First: Prevernt build break by automerger

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 7383d6f..9ccdb98 100644
--- a/apishim/31/com/android/networkstack/apishim/ConnectivityManagerShimImpl.java
+++ b/apishim/31/com/android/networkstack/apishim/ConnectivityManagerShimImpl.java
@@ -76,9 +76,9 @@
      * See android.net.ConnectivityManager#registerDefaultNetworkCallbackAsUid
      */
     @Override
-    public void registerDefaultNetworkCallbackAsUid(
+    public void registerDefaultNetworkCallbackForUid(
             int uid, @NonNull NetworkCallback networkCallback, @NonNull Handler handler) {
-        mCm.registerDefaultNetworkCallbackAsUid(uid, networkCallback, handler);
+        mCm.registerDefaultNetworkCallbackForUid(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 971e500..67b3df7 100644
--- a/apishim/common/com/android/networkstack/apishim/common/ConnectivityManagerShim.java
+++ b/apishim/common/com/android/networkstack/apishim/common/ConnectivityManagerShim.java
@@ -45,8 +45,8 @@
             @NonNull NetworkCallback networkCallback, @NonNull Handler handler)
             throws UnsupportedApiLevelException;
 
-    /** See android.net.ConnectivityManager#registerDefaultNetworkCallbackAsUid */
-    default void registerDefaultNetworkCallbackAsUid(
+    /** See android.net.ConnectivityManager#registerDefaultNetworkCallbackForUid */
+    default void registerDefaultNetworkCallbackForUid(
             int uid, @NonNull NetworkCallback networkCallback, @NonNull Handler handler)
             throws UnsupportedApiLevelException {
         throw new UnsupportedApiLevelException("Only supported starting from API 31");