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

Commit 7afbc249 authored by Tomasz Wasilczyk's avatar Tomasz Wasilczyk Committed by Aishwarya Mallampati
Browse files

Avoid crash on invalid subid 

This sometimes happen in notifyCarrierRoamingNtnSignalStrengthChanged

Bug: 371632841
Test: atest TelephonyRegistryTest
Flag: EXEMPT bugfix
Change-Id: I772a8f22936695d5a79abc2978bb5d5f1b3f34d9
parent caf2c00b

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

+4 −0
Original line number Diff line number Diff line
@@ -3872,6 +3872,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.");