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

Commit db33fc17 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Avoid crash on invalid subid" into main

parents f716da24 7afbc249

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