Merge "[CM] Allow timeout in request network" am: 8328f27a87 am: 645b48c8af

am: ac879cbcaf

Change-Id: If42250966d619073d45d608aab454589213b1756

diff --cc api/current.txt
index d6525fb,38e05a0..9d09c6a
--- 1/api/current.txt
--- 2/api/current.txt
+++ b/api/current.txt
@@@ -24951,9 -23644,13 +24951,10 @@@ package android.net 
      method public void reportNetworkConnectivity(android.net.Network, boolean);
      method public boolean requestBandwidthUpdate(android.net.Network);
      method public void requestNetwork(android.net.NetworkRequest, android.net.ConnectivityManager.NetworkCallback);
+     method public void requestNetwork(android.net.NetworkRequest, int, 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 void unregisterNetworkCallback(android.app.PendingIntent);
      field public static final deprecated java.lang.String ACTION_BACKGROUND_DATA_SETTING_CHANGED = "android.net.conn.BACKGROUND_DATA_SETTING_CHANGED";

diff --cc api/system-current.txt
index 37ae7d7,51ef55c..428359b
--- 1/api/system-current.txt
--- 2/api/system-current.txt
+++ b/api/system-current.txt
@@@ -27044,7 -25431,9 +27044,8 @@@ package android.net 
      method public void reportNetworkConnectivity(android.net.Network, boolean);
      method public boolean requestBandwidthUpdate(android.net.Network);
      method public void requestNetwork(android.net.NetworkRequest, android.net.ConnectivityManager.NetworkCallback);
+     method public void requestNetwork(android.net.NetworkRequest, int, 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 void startTethering(int, boolean, android.net.ConnectivityManager.OnStartTetheringCallback);

diff --cc api/test-current.txt
index ef17b07,ae5b85b..9c2f3bb
--- 1/api/test-current.txt
--- 2/api/test-current.txt
+++ b/api/test-current.txt
@@@ -25048,9 -23718,13 +25048,10 @@@ package android.net 
      method public void reportNetworkConnectivity(android.net.Network, boolean);
      method public boolean requestBandwidthUpdate(android.net.Network);
      method public void requestNetwork(android.net.NetworkRequest, android.net.ConnectivityManager.NetworkCallback);
+     method public void requestNetwork(android.net.NetworkRequest, int, 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 void unregisterNetworkCallback(android.app.PendingIntent);
      field public static final deprecated java.lang.String ACTION_BACKGROUND_DATA_SETTING_CHANGED = "android.net.conn.BACKGROUND_DATA_SETTING_CHANGED";

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