Merge "To fix the getLine1Number return empty string." am: cdcd681ddc (a167ff77) · Commits · e / devices / smdk4412 / android_frameworks_opt_telephony

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -1421,7 +1421,7 @@ public class GsmCdmaPhone extends Phone {
		b.getString(CarrierConfigManager.KEY_DEFAULT_VM_NUMBER_ROAMING_STRING);
		if (!TextUtils.isEmpty(defaultVmNumberRoaming) && mSST.mSS.getRoaming()) {
		number = defaultVmNumberRoaming;
		} else {
		} else if (!TextUtils.isEmpty(defaultVmNumber)) {
		number = defaultVmNumber;
		}
		}