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
This commit is contained in:
committed by
Android Git Automerger
commit
9cbbececf4
@@ -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) {
|
||||
|
||||
Reference in New Issue
Block a user