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

Unverified Commit e4f80c74 authored by Ricardo Cerqueira's avatar Ricardo Cerqueira Committed by Adrian DC
Browse files

SubscriptionInfoUpdater: Unbreak usage of TelephonyPlugin 

Change I5b829662b466f609cd22adfa7d3b754757258463 made some changes
to how and when we accept to update the subInfo records which depend
on state flags and messages added the SubscriptionInfoUpdater.

However, a delegated TelephonyPlugin (say... QTI extensions) isn't
aware of those, won't manipulate them, and won't generate the expected
update messages, resulting in missed data updates and inconsistent
subscriptionInfo objects (in particular, as a result of hot swaps)

So... return the behavior of the exported updateSubscriptionInfoByIccId()
to the original expectations, and reserve the new behavior for internal
calls.

RM-290

Change-Id: I4c9e9c40756d049d346145cb03e0c3c5c84e13ad
parent af44e9d7

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

+7 −3
Original line number Diff line number Diff line
@@ -365,7 +365,7 @@ public class SubscriptionInfoUpdater extends Handler { 
            case EVENT_UPDATE_INSERTED_SIM_COUNT:

                logd("EVENT_UPDATE_INSERTED_SIM_COUNT: locked sims: " + mLockedSims.cardinality());

                if (isAllIccIdQueryDone() && !hasMessages(EVENT_UPDATE_INSERTED_SIM_COUNT)) {

                    updateSubscriptionInfoByIccId();

                    updateSubscriptionInfoByIccIdInternal(false);

                    logd("update inserted sim count, current sim count: " + mCurrentSimCount);

                }

                break;
@@ -415,7 +415,7 @@ public class SubscriptionInfoUpdater extends Handler { 
    private void update(int slotId) {

        sendMessageDelayed(obtainMessage(EVENT_UPDATE_INSERTED_SIM_COUNT, slotId), DELAY_MILLIS);

        if (isAllIccIdQueryDone()) {

            updateSubscriptionInfoByIccId();

            updateSubscriptionInfoByIccIdInternal(false);

        }

    }
@@ -614,10 +614,14 @@ public class SubscriptionInfoUpdater extends Handler { 
     * only what the current list contains.

     */

    synchronized protected void updateSubscriptionInfoByIccId() {

        updateSubscriptionInfoByIccIdInternal(true);

    }



    synchronized private void updateSubscriptionInfoByIccIdInternal(boolean forceUpdate) {

        logd("updateSubscriptionInfoByIccId:+ Start");



        // only update external state if we have no pending updates pending

        boolean update = !hasMessages(EVENT_UPDATE_INSERTED_SIM_COUNT);

        boolean update = !hasMessages(EVENT_UPDATE_INSERTED_SIM_COUNT) || forceUpdate;

        if (update) {

            mSubscriptionManager.clearSubscriptionInfo();

        }