diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-12-18 15:14:08 -0800 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2012-12-18 15:14:12 -0800 |
| commit | 48576911a2de25c46ecfbecdf7dcb373b70be3a5 (patch) | |
| tree | 108659138abd42e51d77aac4fa8366f4e4b3c4da /services/java/com | |
| parent | 0c1badc64e5340b643640d37120bf926142dda1b (diff) | |
| parent | 9b64c4906be5314a6c2cde520317b8cb36e7b3e4 (diff) | |
| download | frameworks_base-48576911a2de25c46ecfbecdf7dcb373b70be3a5.zip frameworks_base-48576911a2de25c46ecfbecdf7dcb373b70be3a5.tar.gz frameworks_base-48576911a2de25c46ecfbecdf7dcb373b70be3a5.tar.bz2 | |
Merge from AOSP staging branch
Change-Id: Iad3df4845e6fae16c4ae6dbddcad0121d4775dcd
Diffstat (limited to 'services/java/com')
| -rw-r--r-- | services/java/com/android/server/ConnectivityService.java | 7 |
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 a7c4d73..cccaf1c 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) { |