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

Commit ae859ed9 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 13348984 from e590f4e2 to 25Q3-release 

Change-Id: Icd734ea1d03506aa29570df43a5638ed90d0b722
parents 52d48c29 e590f4e2

flags/messaging.aconfig

+0 −11
Original line number Diff line number Diff line
@@ -18,17 +18,6 @@ flag { 
  bug: "305062594"

}



# OWNER=linggm TARGET=24Q4

flag {

  name: "mms_get_apn_from_pdsc"

  namespace: "telephony"

  description: "This flag controls get APN details from PDSC instead of telephony provider."

  bug: "324280016"

  metadata {

    purpose: PURPOSE_BUGFIX

  }

}



# OWNER=stevestatia TARGET=24Q3

flag {

    name: "unregister_sms_broadcast_receiver_from_cat_service"

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/ims/ImsServiceController.java

+5 −7
Original line number Diff line number Diff line
@@ -1004,14 +1004,12 @@ public class ImsServiceController { 


    @Override

    public String toString() {

        synchronized (mLock) {

        return "[ImsServiceController: componentName=" + getComponentName() + ", boundUser="

                + mBoundUser + ", features=" + mImsFeatures + ", isBinding=" + mIsBinding

                + ", isBound=" + mIsBound + ", serviceController=" + getImsServiceController()

                + ", rebindDelay=" + getRebindDelay() + ", slotToSubIdMap=" + mSlotIdToSubIdMap

                + "]";

    }

    }



    public void dump(PrintWriter printWriter) {

        mLocalLog.dump(printWriter);

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 {