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

Commit 9fd89f37 authored by Jordan Liu's avatar Jordan Liu Committed by android-build-merger
Browse files

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

am: 81c33b98

Change-Id: I065d9965e135f5a29d750232409a2f1fcd7c2499
parents bfc0a8de 81c33b98

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

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

                log(str);

            }

            }

            mLocalLog.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;

                mServiceState[phoneId] = state;





                for (Record r : mRecords) {

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

                    }

                }

                }

            } else {

            } else {

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

                log("notifyServiceStateForSubscriber: INVALID phoneId=" + phoneId

                        + " or subId=" + subId);

            }

            }

            handleRemoveListLocked();

            handleRemoveListLocked();

        }

        }