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

Commit b78e2d0f authored by Amit Mahajan's avatar Amit Mahajan
Browse files

Revert "Do not notify SS change with invalid subId" 

This reverts commit 6db77174.

Reason for revert: b/138357571 (no signal bars even when device is in service)

Change-Id: I98eb708ef4f624bfba541d409837846662255d72
parent 6db77174

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

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

            }

            mLocalLog.log(str);

            // 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)) {

            if (validatePhoneId(phoneId)) {

                mServiceState[phoneId] = state;



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

                }

            } else {

                log("notifyServiceStateForSubscriber: INVALID phoneId=" + phoneId

                        + " or subId=" + subId);

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

            }

            handleRemoveListLocked();

        }