Rename a couple variables in IccRecords. (b7881d6e) · Commits · e / os / android_frameworks_opt_telephony

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -774,7 +774,7 @@ public abstract class PhoneBase extends Handler implements Phone {
		@Override
		public String getIccSerialNumber() {
		IccRecords r = mIccRecords.get();
		return (r != null) ? r.iccId : "";
		return (r != null) ? r.getIccId() : "";
		}

		@Override

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

+14 −10

Original line number	Diff line number	Diff line
		@@ -42,7 +42,7 @@ public abstract class IccRecords extends Handler implements IccConstants {
		protected IccFileHandler mFh;
		protected UiccCardApplication mParentApp;

		protected RegistrantList recordsLoadedRegistrants = new RegistrantList();
		protected RegistrantList mRecordsLoadedRegistrants = new RegistrantList();
		protected RegistrantList mImsiReadyRegistrants = new RegistrantList();
		protected RegistrantList mRecordsEventsRegistrants = new RegistrantList();
		protected RegistrantList mNewSmsRegistrants = new RegistrantList();
		@@ -56,7 +56,7 @@ public abstract class IccRecords extends Handler implements IccConstants {

		protected boolean mRecordsRequested = false; // true if we've made requests for the sim records

		public String iccId;
		protected String mIccId;
		protected String mMsisdn = null; // My mobile number
		protected String mMsisdnTag = null;
		protected String mVoiceMailNum = null;
		@@ -99,7 +99,7 @@ public abstract class IccRecords extends Handler implements IccConstants {
		+ " mCi=" + mCi
		+ " mFh=" + mFh
		+ " mParentApp=" + mParentApp
		+ " recordsLoadedRegistrants=" + recordsLoadedRegistrants
		+ " recordsLoadedRegistrants=" + mRecordsLoadedRegistrants
		+ " mImsiReadyRegistrants=" + mImsiReadyRegistrants
		+ " mRecordsEventsRegistrants=" + mRecordsEventsRegistrants
		+ " mNewSmsRegistrants=" + mNewSmsRegistrants
		@@ -108,7 +108,7 @@ public abstract class IccRecords extends Handler implements IccConstants {
		+ " recordsToLoad=" + mRecordsToLoad
		+ " adnCache=" + mAdnCache
		+ " recordsRequested=" + mRecordsRequested
		+ " iccid=" + iccId
		+ " iccid=" + mIccId
		+ " msisdn=" + mMsisdn
		+ " msisdnTag=" + mMsisdnTag
		+ " voiceMailNum=" + mVoiceMailNum
		@@ -166,20 +166,24 @@ public abstract class IccRecords extends Handler implements IccConstants {
		return mAdnCache;
		}

		public String getIccId() {
		return mIccId;
		}

		public void registerForRecordsLoaded(Handler h, int what, Object obj) {
		if (mDestroyed.get()) {
		return;
		}

		Registrant r = new Registrant(h, what, obj);
		recordsLoadedRegistrants.add(r);
		mRecordsLoadedRegistrants.add(r);

		if (mRecordsToLoad == 0 && mRecordsRequested == true) {
		r.notifyRegistrant(new AsyncResult(null, null, null));
		}
		}
		public void unregisterForRecordsLoaded(Handler h) {
		recordsLoadedRegistrants.remove(h);
		mRecordsLoadedRegistrants.remove(h);
		}

		public void registerForImsiReady(Handler h, int what, Object obj) {
		@@ -493,10 +497,10 @@ public abstract class IccRecords extends Handler implements IccConstants {
		pw.println(" mCi=" + mCi);
		pw.println(" mFh=" + mFh);
		pw.println(" mParentApp=" + mParentApp);
		pw.println(" recordsLoadedRegistrants: size=" + recordsLoadedRegistrants.size());
		for (int i = 0; i < recordsLoadedRegistrants.size(); i++) {
		pw.println(" recordsLoadedRegistrants: size=" + mRecordsLoadedRegistrants.size());
		for (int i = 0; i < mRecordsLoadedRegistrants.size(); i++) {
		pw.println(" recordsLoadedRegistrants[" + i + "]="
		+ ((Registrant)recordsLoadedRegistrants.get(i)).getHandler());
		+ ((Registrant)mRecordsLoadedRegistrants.get(i)).getHandler());
		}
		pw.println(" mImsiReadyRegistrants: size=" + mImsiReadyRegistrants.size());
		for (int i = 0; i < mImsiReadyRegistrants.size(); i++) {
		@@ -522,7 +526,7 @@ public abstract class IccRecords extends Handler implements IccConstants {
		pw.println(" mRecordsRequested=" + mRecordsRequested);
		pw.println(" mRecordsToLoad=" + mRecordsToLoad);
		pw.println(" mRdnCache=" + mAdnCache);
		pw.println(" iccid=" + iccId);
		pw.println(" iccid=" + mIccId);
		pw.println(" mMsisdn=" + mMsisdn);
		pw.println(" mMsisdnTag=" + mMsisdnTag);
		pw.println(" mVoiceMailNum=" + mVoiceMailNum);

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -205,7 +205,7 @@ public final class IsimUiccRecords extends IccRecords implements IsimRecords {

		@Override
		protected void onAllRecordsLoaded() {
		recordsLoadedRegistrants.notifyRegistrants(
		mRecordsLoadedRegistrants.notifyRegistrants(
		new AsyncResult(null, null, null));
		}

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

+4 −4

Original line number	Diff line number	Diff line
		@@ -135,7 +135,7 @@ public final class RuimRecords extends IccRecords {
		protected void resetRecords() {
		mCountVoiceMessages = 0;
		mMncLength = UNINITIALIZED;
		iccId = null;
		mIccId = null;

		mAdnCache.reset();

		@@ -513,9 +513,9 @@ public final class RuimRecords extends IccRecords {
		break;
		}

		iccId = IccUtils.bcdToString(data, 0, data.length);
		mIccId = IccUtils.bcdToString(data, 0, data.length);

		log("iccid: " + iccId);
		log("iccid: " + mIccId);

		break;

		@@ -641,7 +641,7 @@ public final class RuimRecords extends IccRecords {
		}

		setLocaleFromCsim();
		recordsLoadedRegistrants.notifyRegistrants(
		mRecordsLoadedRegistrants.notifyRegistrants(
		new AsyncResult(null, null, null));
		}

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

+4 −4

Original line number	Diff line number	Diff line
		@@ -221,7 +221,7 @@ public class SIMRecords extends IccRecords {
		mVoiceMailNum = null;
		mCountVoiceMessages = 0;
		mMncLength = UNINITIALIZED;
		iccId = null;
		mIccId = null;
		// -1 means no EF_SPN found; treat accordingly.
		mSpnDisplayCondition = -1;
		mEfMWIS = null;
		@@ -806,9 +806,9 @@ public class SIMRecords extends IccRecords {
		break;
		}

		iccId = IccUtils.bcdToString(data, 0, data.length);
		mIccId = IccUtils.bcdToString(data, 0, data.length);

		log("iccid: " + iccId);
		log("iccid: " + mIccId);

		break;

		@@ -1329,7 +1329,7 @@ public class SIMRecords extends IccRecords {
		setVoiceMailByCountry(operator);
		setSpnFromConfig(operator);

		recordsLoadedRegistrants.notifyRegistrants(
		mRecordsLoadedRegistrants.notifyRegistrants(
		new AsyncResult(null, null, null));
		}