commit 9cbbececf41458ba68454794887794425c0259b0
author Jean-Baptiste Queru <jbq@google.com> Tue Dec 18 15:52:45 2012 -0800
committer Android Git Automerger <android-git-automerger@android.com> Tue Dec 18 15:52:45 2012 -0800
tree d88c63d05043fb63973d235b8c5e6fdd21c424c7
parent f909cb1535704ba7194c1bcb4911e5640379e9e2
parent fe26d4e66574bc4bcca22a9962f25fd5b6b4ccc0

am fe26d4e6: Merge from AOSP staging branch

* commit 'fe26d4e66574bc4bcca22a9962f25fd5b6b4ccc0':
  Return error upon attempt to use non-existent APN
  Memory leak due to bad destroy sequence

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 8c5ff04..4cfe5d5 100644
--- a/services/java/com/android/server/ConnectivityService.java
+++ b/services/java/com/android/server/ConnectivityService.java
@@ -1193,8 +1193,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) {