Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 55484ae3 authored by Wink Saville's avatar Wink Saville Committed by Android Git Automerger
Browse files

am ea25ea79: am ba5e533e: Merge "In isMobileOk don\'t execute finally if... 

am ea25ea79: am ba5e533e: Merge "In isMobileOk don\'t execute finally if mobile data is not supported." into klp-dev

* commit 'ea25ea79':
  In isMobileOk don't execute finally if mobile data is not supported.
parents ee66da46 ea25ea79

services/java/com/android/server/ConnectivityService.java

+6 −6
Original line number Diff line number Diff line
@@ -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;

            }



            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);