Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3be9fb03 authored by fionaxu's avatar fionaxu
Browse files

Fix the issue of reading ADN EF failure 

BUG: 22828728
related cc:
https://partner-android-review.googlesource.com/#/c/220023/
Change-Id: If1eb675508f80abdd76695f4aaf5445a0c1f24b3
parent 6f769551

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);

                    }

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

+3 −6
Original line number Diff line number Diff line
@@ -106,8 +106,7 @@ public class IccSmsInterfaceManager { 
                            if (Rlog.isLoggable("SMS", Log.DEBUG)) {

                                log("Cannot load Sms records");

                            }

                            if (mSms != null)

                                mSms.clear();

                            mSms = null;

                        }

                        mLock.notifyAll();

                    }
@@ -297,11 +296,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);