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

Commit 0746e41f authored by Tyler Gunn's avatar Tyler Gunn Committed by Automerger Merge Worker
Browse files

Merge "Also bind to device ImsService when SIM state moves to NOT_READY" into sc-dev am: 8070c975 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/15179332

Change-Id: Ia0cd05af99162e46161c5c516f1c5f884dd5ea74
parents 1c6b3a45 8070c975

src/java/com/android/internal/telephony/ims/ImsResolver.java

+6 −3
Original line number Diff line number Diff line
@@ -274,15 +274,18 @@ public class ImsResolver implements ImsServiceController.ImsServiceControllerCal 
                    SubscriptionManager.INVALID_SUBSCRIPTION_ID);

            int slotSimState = mTelephonyManagerProxy.getSimState(mContext, slotId);

            if (subId == SubscriptionManager.INVALID_SUBSCRIPTION_ID

                    && slotSimState != TelephonyManager.SIM_STATE_ABSENT) {

                    && (slotSimState != TelephonyManager.SIM_STATE_ABSENT

                    && slotSimState != TelephonyManager.SIM_STATE_NOT_READY)) {

                // We only care about carrier config updates that happen when a slot is known to be

                // absent or populated and the carrier config has been loaded.

                // absent, the subscription is disabled (not ready), or populated and the carrier

                // config has been loaded.

                Log.i(TAG, "Received CCC for slot " + slotId + " and sim state "

                        + slotSimState + ", ignoring.");

                return;

            }



            Log.i(TAG, "Received Carrier Config Changed for SlotId: " + slotId);

            Log.i(TAG, "Received Carrier Config Changed for SlotId: " + slotId

                    + ", sim state: " + slotSimState);



            mHandler.obtainMessage(HANDLER_CONFIG_CHANGED, slotId).sendToTarget();

        }