Merge from AOSP staging branch

Change-Id: Iad3df4845e6fae16c4ae6dbddcad0121d4775dcd
2012-12-18 15:14:08 -08:00
parent 876ddc9564 c6534b5030
commit fe26d4e665
1 changed files with 5 additions and 2 deletions
--- a/services/java/com/android/server/ConnectivityService.java
+++ b/services/java/com/android/server/ConnectivityService.java
@@ -1183,8 +1183,11 @@ public class ConnectivityService extends IConnectivityManager.Stub {
                        log("startUsingNetworkFeature reconnecting to " + networkType + ": " +
                                feature);
                    }
-                    network.reconnect();
-                    return PhoneConstants.APN_REQUEST_STARTED;
+                    if (network.reconnect()) {
+                        return PhoneConstants.APN_REQUEST_STARTED;
+                    } else {
+                        return PhoneConstants.APN_REQUEST_FAILED;
+                    }
                } else {
                    // need to remember this unsupported request so we respond appropriately on stop
                    synchronized(this) {