Merge "Revert "requestBwUpdate() public API review""

3 files changed, 9 insertions, 11 deletions

diff --git a/core/java/android/net/ConnectivityManager.java b/core/java/android/net/ConnectivityManager.java
index 6870327..3e9b3d6 100644
--- a/core/java/android/net/ConnectivityManager.java
+++ b/core/java/android/net/ConnectivityManager.java
@@ -2441,19 +2441,17 @@ public class ConnectivityManager {
     }
 
     /**
-     * Requests bandwidth update for a given {@link Network} and returns whether the update request
-     * is accepted by ConnectivityService. Once accepted, ConnectivityService will poll underlying
-     * network connection for updated bandwidth information. The caller will be notified via
-     * {@link ConnectivityManager.NetworkCallback} if there is an update. Notice that this
-     * method assumes that the caller has previously called {@link #registerNetworkCallback} to
-     * listen for network changes.
+     * Request connectivityservice to refresh network capabilities for the given
+     * {@link network}. This method returns true if the network is still active, false
+     * otherwise. Notice the method call assumes the caller has registered for
+     * listening NetworkCapabilities updates.
      *
      * @param network{@link Network} specifying which network you're interested.
-     * @return {@code true} on success, {@code false} if the {@link Network} is no longer valid.
+     * @hide
      */
-    public boolean requestBandwidthUpdate(Network network) {
+    public boolean requestBwUpdate(Network network) {
         try {
-            return mService.requestBandwidthUpdate(network);
+            return mService.requestBwUpdate(network);
         } catch (RemoteException e) {
             return false;
         }
diff --git a/core/java/android/net/IConnectivityManager.aidl b/core/java/android/net/IConnectivityManager.aidl
index efc76b3..d6c0693 100644
--- a/core/java/android/net/IConnectivityManager.aidl
+++ b/core/java/android/net/IConnectivityManager.aidl
@@ -134,7 +134,7 @@ interface IConnectivityManager
 
     void registerNetworkFactory(in Messenger messenger, in String name);
 
-    boolean requestBandwidthUpdate(in Network network);
+    boolean requestBwUpdate(in Network network);
 
     void unregisterNetworkFactory(in Messenger messenger);
 
diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java
index 9ec1c6a..bba3580 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -3454,7 +3454,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
     }
 
     @Override
-    public boolean requestBandwidthUpdate(Network network) {
+    public boolean requestBwUpdate(Network network) {
         enforceAccessPermission();
         NetworkAgentInfo nai = null;
         if (network == null) {