Merge "WFC SPN only when connected to WiFi" (41b9fa60) · Commits · e / devices / smdk4412 / android_frameworks_opt_telephony

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

+4 −2

Original line number	Original line	Diff line number	Diff line
	@@ -2777,8 +2777,10 @@ public class ServiceStateTracker extends Handler {
	String wfcFlightSpnFormat = null;		String wfcFlightSpnFormat = null;
	int combinedRegState = getCombinedRegState(mSS);		int combinedRegState = getCombinedRegState(mSS);
	if (mPhone.getImsPhone() != null && mPhone.getImsPhone().isWifiCallingEnabled()		if (mPhone.getImsPhone() != null && mPhone.getImsPhone().isWifiCallingEnabled()
	&& (combinedRegState == ServiceState.STATE_IN_SERVICE)) {		&& (combinedRegState == ServiceState.STATE_IN_SERVICE
	// In Wi-Fi Calling mode show SPN or PLMN + WiFi Calling		&& mSS.getDataNetworkType() == TelephonyManager.NETWORK_TYPE_IWLAN)) {
			// In Wi-Fi Calling mode (connected to WiFi and WFC enabled),
			// show SPN or PLMN + WiFi Calling
	//		//
	// 1) Show SPN + Wi-Fi Calling If SIM has SPN and SPN display condition		// 1) Show SPN + Wi-Fi Calling If SIM has SPN and SPN display condition
	// is satisfied or SPN override is enabled for this carrier		// is satisfied or SPN override is enabled for this carrier