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

Commit 81c33b98 authored by Jordan Liu's avatar Jordan Liu Committed by Android (Google) Code Review
Browse files

Merge "Do not notify SS change with invalid subId" into qt-qpr1-dev

parents 052a08bc 55b2bc46

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

+8 −2
Original line number Diff line number Diff line
@@ -1027,7 +1027,12 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { 
                log(str);

            }

            mLocalLog.log(str);

            if (validatePhoneId(phoneId)) {

            // for service state updates, don't notify clients when subId is invalid. This prevents

            // us from sending incorrect notifications like b/133140128

            // In the future, we can remove this logic for every notification here and add a

            // callback so listeners know when their PhoneStateListener's subId becomes invalid, but

            // for now we use the simplest fix.

            if (validatePhoneId(phoneId) && SubscriptionManager.isValidSubscriptionId(subId)) {

                mServiceState[phoneId] = state;



                for (Record r : mRecords) {
@@ -1059,7 +1064,8 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { 
                    }

                }

            } else {

                log("notifyServiceStateForSubscriber: INVALID phoneId=" + phoneId);

                log("notifyServiceStateForSubscriber: INVALID phoneId=" + phoneId

                        + " or subId=" + subId);

            }

            handleRemoveListLocked();

        }