Merge "Fix the issue of reading ADN EF failure" into mm-wireless-dev (eb02449c) · Commits · e / os / android_frameworks_opt_telephony

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

+1 −3

Original line number	Diff line number	Diff line
		@@ -93,9 +93,7 @@ public class IccPhoneBookInterfaceManager {
		mRecords = (List<AdnRecord>) ar.result;
		} else {
		if(DBG) logd("Cannot load ADN records");
		if (mRecords != null) {
		mRecords.clear();
		}
		mRecords = null;
		}
		notifyPending(ar);
		}

+3 −6

Original line number	Diff line number	Diff line
		@@ -107,8 +107,7 @@ public class IccSmsInterfaceManager {
		if (Rlog.isLoggable("SMS", Log.DEBUG)) {
		log("Cannot load Sms records");
		}
		if (mSms != null)
		mSms.clear();
		mSms = null;
		}
		mLock.notifyAll();
		}
		@@ -298,11 +297,9 @@ public class IccSmsInterfaceManager {
		IccFileHandler fh = mPhone.getIccFileHandler();
		if (fh == null) {
		Rlog.e(LOG_TAG, "Cannot load Sms records. No icc card?");
		if (mSms != null) {
		mSms.clear();
		mSms = null;
		return mSms;
		}
		}

		Message response = mHandler.obtainMessage(EVENT_LOAD_DONE);
		fh.loadEFLinearFixedAll(IccConstants.EF_SMS, response);