Merge "Sprint: MMS cannot be sent in the UK" into lmp-mr1-dev (59c6f03a) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/cdma/CDMAPhone.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -42,6 +42,7 @@ import android.telephony.SubscriptionManager;
		import android.telephony.cdma.CdmaCellLocation;
		import android.text.TextUtils;
		import android.telephony.Rlog;
		import android.util.Log;

		import com.android.ims.ImsManager;
		import com.android.internal.telephony.Call;
		@@ -580,6 +581,9 @@ public class CDMAPhone extends PhoneBase {
		@Override
		public String getNai() {
		IccRecords r = mIccRecords.get();
		if (Log.isLoggable(LOG_TAG, Log.VERBOSE)) {
		Rlog.v(LOG_TAG, "IccRecords is " + r);
		}
		return (r != null) ? r.getNAI() : null;
		}

+11 −2

Original line number	Diff line number	Diff line
		@@ -38,8 +38,10 @@ import android.telephony.TelephonyManager;

		import com.android.ims.ImsManager;
		import com.android.internal.telephony.CallTracker;

		import android.text.TextUtils;
		import android.telephony.Rlog;
		import android.util.Log;

		import static com.android.internal.telephony.CommandsInterface.CF_ACTION_DISABLE;
		import static com.android.internal.telephony.CommandsInterface.CF_ACTION_ENABLE;
		@@ -69,7 +71,6 @@ import com.android.internal.telephony.PhoneConstants;
		import com.android.internal.telephony.PhoneNotifier;
		import com.android.internal.telephony.PhoneProxy;
		import com.android.internal.telephony.PhoneSubInfo;

		import com.android.internal.telephony.TelephonyProperties;
		import com.android.internal.telephony.UUSInfo;
		import com.android.internal.telephony.imsphone.ImsPhone;
		@@ -83,7 +84,6 @@ import com.android.internal.telephony.ServiceStateTracker;
		import com.android.internal.telephony.uicc.IsimRecords;
		import com.android.internal.telephony.uicc.IsimUiccRecords;


		import java.io.FileDescriptor;
		import java.io.PrintWriter;
		import java.util.ArrayList;
		@@ -1045,6 +1045,15 @@ public class GSMPhone extends PhoneBase {
		return "0";
		}

		@Override
		public String getNai() {
		IccRecords r = mUiccController.getIccRecords(mPhoneId, UiccController.APP_FAM_3GPP2);
		if (Log.isLoggable(LOG_TAG, Log.VERBOSE)) {
		Rlog.v(LOG_TAG, "IccRecords is " + r);
		}
		return (r != null) ? r.getNAI() : null;
		}

		@Override
		public String getSubscriberId() {
		IccRecords r = mIccRecords.get();

+3 −0

Original line number	Diff line number	Diff line
		@@ -541,6 +541,9 @@ public final class RuimRecords extends IccRecords {
		naiCharArray[index1] = (char)(bitStream.read(8) & 0xFF);
		}
		mNai = new String(naiCharArray);
		if (Log.isLoggable(LOG_TAG, Log.VERBOSE)) {
		Log.v(LOG_TAG,"MIPUPP Nai = " + mNai);
		}
		return; //need not parsing further
		} else {
		//ignore this NAI body