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

Commit 5c084445 authored by Xiangyu/Malcolm Chen's avatar Xiangyu/Malcolm Chen Committed by Automerger Merge Worker
Browse files

Merge "Fix bug that notifyDisplayInfoChanged is notified on wrong record" into... 

Merge "Fix bug that notifyDisplayInfoChanged is notified on wrong record" into rvc-dev am: ebb1992c am: 86ac1a3e

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11812870

Change-Id: Icd4c28b1b6b8686481b623f95ab73f75ff6a3c43
parents dab10f9d 86ac1a3e

services/core/java/com/android/server/TelephonyRegistry.java

+19 −1
Original line number Diff line number Diff line
@@ -1606,7 +1606,7 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { 
                for (Record r : mRecords) {

                    if (r.matchPhoneStateListenerEvent(

                            PhoneStateListener.LISTEN_DISPLAY_INFO_CHANGED)

                            && idMatch(r.subId, subId, phoneId)) {

                            && idMatchWithoutDefaultPhoneCheck(r.subId, subId)) {

                        try {

                            r.callback.onDisplayInfoChanged(telephonyDisplayInfo);

                        } catch (RemoteException ex) {
@@ -2726,6 +2726,24 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { 
        Rlog.e(TAG, s);

    }



    /**

     * If the registrant specified a subId, then we should only notify it if subIds match.

     * If the registrant registered with DEFAULT subId, we should notify only when the related subId

     * is default subId (which could be INVALID if there's no default subId).

     *

     * This should be the correct way to check record ID match. in idMatch the record's phoneId is

     * speculated based on subId passed by the registrant so it's not a good reference.

     * But to avoid triggering potential regression only replace idMatch with it when an issue with

     * idMatch is reported. Eventually this should replace all instances of idMatch.

     */

    private boolean idMatchWithoutDefaultPhoneCheck(int subIdInRecord, int subIdToNotify) {

        if (subIdInRecord == SubscriptionManager.DEFAULT_SUBSCRIPTION_ID) {

            return (subIdToNotify == mDefaultSubId);

        } else {

            return (subIdInRecord == subIdToNotify);

        }

    }



    boolean idMatch(int rSubId, int subId, int phoneId) {



        if(subId < 0) {