Merge "API review for requestBandwidthUpdate()"

diff --cc api/current.txt
index eb69ed6,91de125..085b64d
--- 1/api/current.txt
--- 2/api/current.txt
+++ b/api/current.txt
@@@ -18318,14 -18202,16 +18318,15 @@@ package android.net 
      method public void reportNetworkConnectivity(android.net.Network, boolean);
      method public void requestNetwork(android.net.NetworkRequest, android.net.ConnectivityManager.NetworkCallback);
      method public void requestNetwork(android.net.NetworkRequest, android.app.PendingIntent);
 -    method public deprecated boolean requestRouteToHost(int, int);
      method public deprecated void setNetworkPreference(int);
      method public static deprecated boolean setProcessDefaultNetwork(android.net.Network);
 -    method public deprecated int startUsingNetworkFeature(int, java.lang.String);
 -    method public deprecated int stopUsingNetworkFeature(int, java.lang.String);
      method public void unregisterNetworkCallback(android.net.ConnectivityManager.NetworkCallback);
+     method public boolean requestBandwidthUpdate(android.net.Network);
      field public static final deprecated java.lang.String ACTION_BACKGROUND_DATA_SETTING_CHANGED = "android.net.conn.BACKGROUND_DATA_SETTING_CHANGED";
 +    field public static final java.lang.String ACTION_CAPTIVE_PORTAL_SIGN_IN = "android.net.conn.CAPTIVE_PORTAL";
      field public static final java.lang.String CONNECTIVITY_ACTION = "android.net.conn.CONNECTIVITY_CHANGE";
      field public static final deprecated int DEFAULT_NETWORK_PREFERENCE = 1; // 0x1
 +    field public static final java.lang.String EXTRA_CAPTIVE_PORTAL_TOKEN = "captivePortalToken";
      field public static final java.lang.String EXTRA_EXTRA_INFO = "extraInfo";
      field public static final java.lang.String EXTRA_IS_FAILOVER = "isFailover";
      field public static final java.lang.String EXTRA_NETWORK = "android.net.extra.NETWORK";

diff --cc api/system-current.txt
index b8c7fa2,035e0fe..b9c1423
--- 1/api/system-current.txt
--- 2/api/system-current.txt
+++ b/api/system-current.txt
@@@ -19780,14 -19660,16 +19780,15 @@@ package android.net 
      method public void reportNetworkConnectivity(android.net.Network, boolean);
      method public void requestNetwork(android.net.NetworkRequest, android.net.ConnectivityManager.NetworkCallback);
      method public void requestNetwork(android.net.NetworkRequest, android.app.PendingIntent);
 -    method public deprecated boolean requestRouteToHost(int, int);
      method public deprecated void setNetworkPreference(int);
      method public static deprecated boolean setProcessDefaultNetwork(android.net.Network);
 -    method public deprecated int startUsingNetworkFeature(int, java.lang.String);
 -    method public deprecated int stopUsingNetworkFeature(int, java.lang.String);
      method public void unregisterNetworkCallback(android.net.ConnectivityManager.NetworkCallback);
+     method public boolean requestBandwidthUpdate(android.net.Network);
      field public static final deprecated java.lang.String ACTION_BACKGROUND_DATA_SETTING_CHANGED = "android.net.conn.BACKGROUND_DATA_SETTING_CHANGED";
 +    field public static final java.lang.String ACTION_CAPTIVE_PORTAL_SIGN_IN = "android.net.conn.CAPTIVE_PORTAL";
      field public static final java.lang.String CONNECTIVITY_ACTION = "android.net.conn.CONNECTIVITY_CHANGE";
      field public static final deprecated int DEFAULT_NETWORK_PREFERENCE = 1; // 0x1
 +    field public static final java.lang.String EXTRA_CAPTIVE_PORTAL_TOKEN = "captivePortalToken";
      field public static final java.lang.String EXTRA_EXTRA_INFO = "extraInfo";
      field public static final java.lang.String EXTRA_IS_FAILOVER = "isFailover";
      field public static final java.lang.String EXTRA_NETWORK = "android.net.extra.NETWORK";

diff --cc core/java/android/net/ConnectivityManager.java
Simple merge