am b42beeaf: am e63411f2: In isMobileOk don\'t execute finally if mobile data is not supported. (4e6e1749) · Commits · e / os / android_frameworks_base

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

+6 −6

Original line number	Original line	Diff line number	Diff line
	@@ -3732,13 +3732,13 @@ public class ConnectivityService extends IConnectivityManager.Stub {
	Random rand = new Random();		Random rand = new Random();
	mParams = params;		mParams = params;

	try {
	if (mCs.isNetworkSupported(ConnectivityManager.TYPE_MOBILE) == false) {		if (mCs.isNetworkSupported(ConnectivityManager.TYPE_MOBILE) == false) {
	log("isMobileOk: not mobile capable");		log("isMobileOk: not mobile capable");
	result = ConnectivityManager.CMP_RESULT_CODE_NO_CONNECTION;		result = ConnectivityManager.CMP_RESULT_CODE_NO_CONNECTION;
	return result;		return result;
	}		}

			try {
	// Enable fail fast as we'll do retries here and use a		// Enable fail fast as we'll do retries here and use a
	// hipri connection so the default connection stays active.		// hipri connection so the default connection stays active.
	log("isMobileOk: start hipri url=" + params.mUrl);		log("isMobileOk: start hipri url=" + params.mUrl);