summaryrefslogtreecommitdiff
path: root/services/java/com/android/server/ConnectivityService.java
diff options
context:
space:
mode:
authorRobert Greenwalt <rgreenwalt@google.com>2012-12-18 11:02:51 -0800
committerGerrit Code Review <noreply-gerritcodereview@google.com>2012-12-18 11:02:52 -0800
commit9b64c4906be5314a6c2cde520317b8cb36e7b3e4 (patch)
treeb4324db151d1f0cfa9c15b425ad976fadbf86943 /services/java/com/android/server/ConnectivityService.java
parent7979b58a7ade37c3b6d574fd647e633c5b57c3f1 (diff)
parent342a7cb69f8e0cfe208b12cc451c445ae8583e04 (diff)
Merge "Return error upon attempt to use non-existent APN"
Diffstat (limited to 'services/java/com/android/server/ConnectivityService.java')
-rw-r--r--services/java/com/android/server/ConnectivityService.java7
1 files changed, 5 insertions, 2 deletions
diff --git a/services/java/com/android/server/ConnectivityService.java b/services/java/com/android/server/ConnectivityService.java
index ad1dfb279961..ec682e8e33f1 100644
--- 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) {