commit fe26d4e66574bc4bcca22a9962f25fd5b6b4ccc0
author Jean-Baptiste Queru <jbq@google.com> Tue Dec 18 15:14:08 2012 -0800
committer Jean-Baptiste Queru <jbq@google.com> Tue Dec 18 15:14:12 2012 -0800
tree 4448c702d8119d90081c0ecc354197e95cbeceef
parent 876ddc95641f80a37073656589d05ae56e77b650
parent c6534b50300896fc7bc64c475eb0a56508aa3a3d

Merge from AOSP staging branch

Change-Id: Iad3df4845e6fae16c4ae6dbddcad0121d4775dcd

services/java/com/android/server/ConnectivityService.java

diff --git a/services/java/com/android/server/ConnectivityService.java b/services/java/com/android/server/ConnectivityService.java
index a7c4d73..cccaf1c 100644
--- a/services/java/com/android/server/ConnectivityService.java
+++ b/services/java/com/android/server/ConnectivityService.java
@@ -1183,8 +1183,11 @@
                         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) {