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

Commit 5536ed3f authored by Arun Voddu's avatar Arun Voddu Committed by Android (Google) Code Review
Browse files

Merge "Reset the invalidate cache flag when SIM phonebook is empty" into main

parents 4f80ad0d 3ccd0955

flags/uicc.aconfig

+8 −0
Original line number Diff line number Diff line
@@ -126,3 +126,11 @@ flag { 
    description: "This flag controls to launch sim preference page in Setting"

    bug:"381319469"

}



# OWNER=arunvoddu TARGET=25Q3

flag {

    name: "sim_phonebook_cache_fix"

    namespace: "telephony"

    description: "This flag reset the cache if the sim phonebook is empty"

    bug:"404094844"

}
 
 No newline at end of file

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

+7 −7
Original line number Diff line number Diff line
@@ -23,22 +23,19 @@ import android.os.Handler; 
import android.os.Message;

import android.telephony.Rlog;

import android.telephony.TelephonyManager;

import android.text.TextUtils;



import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.telephony.CommandsInterface;

import com.android.internal.telephony.RadioInterfaceCapabilityController;

import com.android.internal.telephony.uicc.AdnCapacity;

import com.android.internal.telephony.uicc.IccConstants;

import com.android.internal.telephony.flags.Flags;



import java.util.ArrayList;

import java.util.Collections;

import java.util.concurrent.atomic.AtomicBoolean;

import java.util.concurrent.atomic.AtomicReference;

import java.util.concurrent.ConcurrentSkipListMap;

import java.util.Iterator;

import java.util.List;

import java.util.Map;

import java.util.concurrent.ConcurrentSkipListMap;

import java.util.concurrent.atomic.AtomicBoolean;

import java.util.concurrent.atomic.AtomicReference;

import java.util.stream.Collectors;
@@ -443,6 +440,9 @@ public class SimPhonebookRecordCache extends Handler { 
                mIsCacheInvalidated.set(true);

                fillCacheWithoutWaiting();

            } else if (newCapacity.isSimValid()) {

                if(Flags.simPhonebookCacheFix()) {

                    mIsCacheInvalidated.set(false);

                }

                notifyAdnLoadingWaiters();

                tryFireUpdatePendingList();

            } else {