diff options
author | Wink Saville <wink@google.com> | 2013-08-13 12:41:06 -0700 |
---|---|---|
committer | The Android Automerger <android-build@google.com> | 2013-08-29 13:02:23 -0700 |
commit | aa2e36190e0112257a220427af0bd92773f8b082 (patch) | |
tree | 47e49ab9d9fa7d02a0efcaf6be07e0a0073d652a | |
parent | 79c8965bb057899e6be014d7a31aaaced3fdb0f7 (diff) | |
download | base-aa2e36190e0112257a220427af0bd92773f8b082.tar.gz |
In isMobileOk don't execute finally if mobile data is not supported.
Move the early return outside the try {} finally so we don't call
setEnableFailFastMobileData(DctContants.DISABLED). Otherwise
referencing counting is wrong and an exception is thrown in DcTrackerBase.
Bug: 10304904
Change-Id: I5ba5121e473bada9f3daa8d6f3d3577cec8212fc
-rw-r--r-- | services/java/com/android/server/ConnectivityService.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/services/java/com/android/server/ConnectivityService.java b/services/java/com/android/server/ConnectivityService.java index 00935f347202..fa016f458748 100644 --- a/services/java/com/android/server/ConnectivityService.java +++ b/services/java/com/android/server/ConnectivityService.java @@ -3732,13 +3732,13 @@ public class ConnectivityService extends IConnectivityManager.Stub { Random rand = new Random(); mParams = params; - try { - if (mCs.isNetworkSupported(ConnectivityManager.TYPE_MOBILE) == false) { - log("isMobileOk: not mobile capable"); - result = ConnectivityManager.CMP_RESULT_CODE_NO_CONNECTION; - return result; - } + if (mCs.isNetworkSupported(ConnectivityManager.TYPE_MOBILE) == false) { + log("isMobileOk: not mobile capable"); + result = ConnectivityManager.CMP_RESULT_CODE_NO_CONNECTION; + return result; + } + try { // Enable fail fast as we'll do retries here and use a // hipri connection so the default connection stays active. log("isMobileOk: start hipri url=" + params.mUrl); |