Enables writing to USIM phonebook (fixes issue 8976). (74ba31ba) · Commits · e / os / android_frameworks_base

telephony/java/com/android/internal/telephony/AdnRecordCache.java

+18 −1

Original line number	Diff line number	Diff line
		@@ -186,7 +186,12 @@ public final class AdnRecordCache extends Handler implements IccConstants {
		}

		ArrayList<AdnRecord> oldAdnList;

		if (efid == EF_PBR) {
		oldAdnList = mUsimPhoneBookManager.loadEfFilesFromUsim();
		} else {
		oldAdnList = getRecordsIfLoaded(efid);
		}

		if (oldAdnList == null) {
		sendErrorResponse(response, "Adn list not exist for EF:" + efid);
		@@ -208,6 +213,17 @@ public final class AdnRecordCache extends Handler implements IccConstants {
		return;
		}

		if (efid == EF_PBR) {
		AdnRecord foundAdn = oldAdnList.get(index-1);
		efid = foundAdn.efid;
		extensionEF = foundAdn.extRecord;
		index = foundAdn.recordNumber;

		newAdn.efid = efid;
		newAdn.extRecord = extensionEF;
		newAdn.recordNumber = index;
		}

		Message pendingResponse = userWriteResponse.get(efid);

		if (pendingResponse != null) {
		@@ -331,6 +347,7 @@ public final class AdnRecordCache extends Handler implements IccConstants {

		if (ar.exception == null) {
		adnLikeFiles.get(efid).set(index - 1, adn);
		mUsimPhoneBookManager.invalidateCache();
		}

		Message response = userWriteResponse.get(efid);

+3 −0

Original line number	Diff line number	Diff line
		@@ -144,6 +144,9 @@ public abstract class IccPhoneBookInterfaceManager extends IIccPhoneBook.Stub {
		if (DBG) logd("updateAdnRecordsInEfBySearch: efid=" + efid +
		" ("+ oldTag + "," + oldPhoneNumber + ")"+ "==>" +
		" ("+ newTag + "," + newPhoneNumber + ")"+ " pin2=" + pin2);

		efid = updateEfForIccType(efid);

		synchronized(mLock) {
		checkThread();
		success = false;

100644 → 100755

+24 −1

Original line number	Diff line number	Diff line
		@@ -53,6 +53,7 @@ public class UsimPhoneBookManager extends Handler implements IccConstants {
		private ArrayList<byte[]> mIapFileRecord;
		private ArrayList<byte[]> mEmailFileRecord;
		private Map<Integer, ArrayList<String>> mEmailsForAdnRec;
		private boolean mRefreshCache = false;

		private static final int EVENT_PBR_LOAD_DONE = 1;
		private static final int EVENT_USIM_ADN_LOAD_DONE = 2;
		@@ -91,11 +92,19 @@ public class UsimPhoneBookManager extends Handler implements IccConstants {
		mEmailFileRecord = null;
		mPbrFile = null;
		mIsPbrPresent = true;
		mRefreshCache = false;
		}

		public ArrayList<AdnRecord> loadEfFilesFromUsim() {
		synchronized (mLock) {
		if (!mPhoneBookRecords.isEmpty()) return mPhoneBookRecords;
		if (!mPhoneBookRecords.isEmpty()) {
		if (mRefreshCache) {
		mRefreshCache = false;
		refreshCache();
		}
		return mPhoneBookRecords;
		}

		if (!mIsPbrPresent) return null;

		// Check if the PBR file is present in the cache, if not read it
		@@ -116,6 +125,20 @@ public class UsimPhoneBookManager extends Handler implements IccConstants {
		return mPhoneBookRecords;
		}

		private void refreshCache() {
		if (mPbrFile == null) return;
		mPhoneBookRecords.clear();

		int numRecs = mPbrFile.mFileIds.size();
		for (int i = 0; i < numRecs; i++) {
		readAdnFileAndWait(i);
		}
		}

		public void invalidateCache() {
		mRefreshCache = true;
		}

		private void readPbrFileAndWait() {
		mPhone.getIccFileHandler().loadEFLinearFixedAll(EF_PBR, obtainMessage(EVENT_PBR_LOAD_DONE));
		try {