drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 48576911: Merge from AOSP staging branch

Browse Source 
* commit '48576911a2de25c46ecfbecdf7dcb373b70be3a5':
  Return error upon attempt to use non-existent APN
  Memory leak due to bad destroy sequence
This commit is contained in:
Jean-Baptiste Queru
2012-12-18 15:52:45 -08:00
committed by Android Git Automerger
parent ddf6d2907b 48576911a2
commit 12174a1c62
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/java/com/android/server/ConnectivityService.java
View File

@ -1193,8 +1193,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) {