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

Commit aa2e3619 authored by Wink Saville's avatar Wink Saville Committed by The Android Automerger
Browse files

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
parent 79c8965b

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

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

            }



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