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

Commit f592a6b7 authored by Tomasz Wasilczyk's avatar Tomasz Wasilczyk Committed by Android (Google) Code Review
Browse files

Merge "Avoid crash on invalid subid" into main

parents aa4fc836 fa3d3a24

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.");