Merge "Send Stack ready on bootup if Flex map is disabled." (c0c05a6e) · Commits · e / devices / smdk4412 / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/ModemStackController.java

+6 −7

Original line number	Diff line number	Diff line
		@@ -684,12 +684,10 @@ public class ModemStackController extends Handler {
		boolean isFlexmapDisabled = (SystemProperties.getInt(
		"persist.radio.disable_flexmap", 0) == 1);

		if (isFlexmapDisabled \|\| callInProgress \|\| mIsPhoneInEcbmMode
		\|\| (!mIsStackReady && !isBootUp)) {
		loge("updateStackBinding: FlexMap Disabled :" + isFlexmapDisabled
		+ "Calls is progress = " + callInProgress + ", mIsPhoneInEcbmMode = "
		+ mIsPhoneInEcbmMode + ", mIsStackReady = " + mIsStackReady +
		". So EXITING!!!");
		if (callInProgress \|\| mIsPhoneInEcbmMode \|\| (!mIsStackReady && !isBootUp)) {
		loge("updateStackBinding: Calls is progress = " + callInProgress +
		", mIsPhoneInEcbmMode = " + mIsPhoneInEcbmMode + ", mIsStackReady = "
		+ mIsStackReady + ". So EXITING!!!");
		return FAILURE;
		}
		for (int i = 0; i < mNumPhones; i++) {
		@@ -704,7 +702,7 @@ public class ModemStackController extends Handler {
		}
		}

		if (isUpdateRequired) {
		if (!isFlexmapDisabled && isUpdateRequired) {
		mIsStackReady = false;
		//Store the msg object , so that result of updateStackbinding can be sent later.
		mUpdateStackMsg = msg;
		@@ -716,6 +714,7 @@ public class ModemStackController extends Handler {
		triggerDeactivationOnAllSubs();
		}
		} else {
		loge("updateStackBinding: FlexMap Disabled : " + isFlexmapDisabled);
		//incase of bootup if cross binding is not required send stack ready notification.
		if (isBootUp) notifyStackReady(false);
		return FAILURE;