summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorWink Saville <wink@google.com>2013-08-13 12:41:06 -0700
committerWink Saville <wink@google.com>2013-08-13 12:41:06 -0700
commitafe58b07dbf9feb8d7396e26f271bf4e2a9447fa (patch)
treee59b576e43d2f76ba29751cafa5dd7bd8e728f7c /services
parentd1f6b6245c546f95a44d0252544ea9e2028a33b4 (diff)
downloadframeworks_base-afe58b07dbf9feb8d7396e26f271bf4e2a9447fa.zip
frameworks_base-afe58b07dbf9feb8d7396e26f271bf4e2a9447fa.tar.gz
frameworks_base-afe58b07dbf9feb8d7396e26f271bf4e2a9447fa.tar.bz2
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
Diffstat (limited to 'services')
-rw-r--r--services/java/com/android/server/ConnectivityService.java12
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 bb0d248..a0e6dd1 100644
--- a/services/java/com/android/server/ConnectivityService.java
+++ b/services/java/com/android/server/ConnectivityService.java
@@ -3916,13 +3916,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);