Merge "UICC : discard language setting of SIM" into lmp-mr1-dev (b7fa93b5) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/uicc/RuimRecords.java

+10 −6

Original line number	Diff line number	Diff line
		@@ -36,6 +36,7 @@ import android.telephony.TelephonyManager;
		import android.telephony.Rlog;
		import android.text.TextUtils;
		import android.util.Log;
		import android.content.res.Resources;

		import com.android.internal.telephony.CommandsInterface;
		import com.android.internal.telephony.GsmAlphabet;
		@@ -853,6 +854,8 @@ public final class RuimRecords extends IccRecords {
		obtainMessage(EVENT_GET_ICCID_DONE));
		mRecordsToLoad++;

		Resources resource = Resources.getSystem();
		if (resource.getBoolean(com.android.internal.R.bool.config_use_sim_language_file)) {
		mFh.loadEFTransparent(EF_PL,
		obtainMessage(EVENT_GET_ICC_RECORD_DONE, new EfPlLoaded()));
		mRecordsToLoad++;
		@@ -860,6 +863,7 @@ public final class RuimRecords extends IccRecords {
		mFh.loadEFTransparent(EF_CSIM_LI,
		obtainMessage(EVENT_GET_ICC_RECORD_DONE, new EfCsimLiLoaded()));
		mRecordsToLoad++;
		}

		mFh.loadEFTransparent(EF_CSIM_SPN,
		obtainMessage(EVENT_GET_ICC_RECORD_DONE, new EfCsimSpnLoaded()));

+6 −0

Original line number	Diff line number	Diff line
		@@ -1503,6 +1503,12 @@ public class SIMRecords extends IccRecords {
		}

		private void loadEfLiAndEfPl() {
		Resources resource = Resources.getSystem();
		if (!resource.getBoolean(com.android.internal.R.bool.config_use_sim_language_file)) {
		if (DBG) log ("Not using EF LI/EF PL");
		return;
		}

		if (mParentApp.getType() == AppType.APPTYPE_USIM) {
		mRecordsRequested = true;
		mFh.loadEFTransparent(EF_LI,