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

Commit fa3d3a24 authored by Tomasz Wasilczyk's avatar Tomasz Wasilczyk
Browse files

Avoid crash on invalid subid 

This sometimes happen in notifyCarrierRoamingNtnSignalStrengthChanged

Bug: 371632841
Test: TH
Flag: EXEMPT bugfix
Change-Id: I02bdab0d7bc562b9d1cf61996a966361811effeb
parent a1273fc2

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

+4 −0
Original line number Diff line number Diff line
@@ -3871,6 +3871,10 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { 
     */

    public void notifyCarrierRoamingNtnSignalStrengthChanged(int subId,

            @NonNull NtnSignalStrength ntnSignalStrength) {

        if (!SubscriptionManager.isValidSubscriptionId(subId)) {

            log("notifyCarrierRoamingNtnSignalStrengthChanged: invalid subscription id");

            return;

        }

        if (!checkNotifyPermission("notifyCarrierRoamingNtnSignalStrengthChanged")) {

            log("notifyCarrierRoamingNtnSignalStrengthChanged: caller does not have required "

                    + "permissions.");