summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorWink Saville <wink@google.com>2013-08-26 11:43:25 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-08-26 11:43:25 -0700
commit4e6e1749eda5a2c84538b0064fdc219aab3605e1 (patch)
tree58c40a71f9951b8b567dbf16f14ef18b780b6eff /services
parentf1fea52744eeaeed37a674c3fc94b7e1dbcda341 (diff)
parentb42beeafcf8117fb4ac41dd91fc9e6113c0d6aae (diff)
downloadframeworks_base-4e6e1749eda5a2c84538b0064fdc219aab3605e1.zip
frameworks_base-4e6e1749eda5a2c84538b0064fdc219aab3605e1.tar.gz
frameworks_base-4e6e1749eda5a2c84538b0064fdc219aab3605e1.tar.bz2
am b42beeaf: am e63411f2: In isMobileOk don\'t execute finally if mobile data is not supported.
* commit 'b42beeafcf8117fb4ac41dd91fc9e6113c0d6aae': In isMobileOk don't execute finally if mobile data is not supported.
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 00935f3..fa016f4 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);