commit 9b64c4906be5314a6c2cde520317b8cb36e7b3e4
author Robert Greenwalt <rgreenwalt@google.com> Tue Dec 18 11:02:51 2012 -0800
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Dec 18 11:02:52 2012 -0800
tree b4324db151d1f0cfa9c15b425ad976fadbf86943
parent 7979b58a7ade37c3b6d574fd647e633c5b57c3f1
parent 342a7cb69f8e0cfe208b12cc451c445ae8583e04

Merge "Return error upon attempt to use non-existent APN"

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 ad1dfb2..ec682e8 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) {