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

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

Merge "Validate phone ID before using" into main

parents d84489a8 808b8d14

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

+8 −0
Original line number Diff line number Diff line
@@ -3535,6 +3535,10 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { 


        synchronized (mRecords) {

            int phoneId = getPhoneIdFromSubId(subId);

            if (!validatePhoneId(phoneId)) {

                loge("Invalid phone ID " + phoneId + " for " + subId);

                return;

            }

            mCarrierRoamingNtnMode[phoneId] = active;

            for (Record r : mRecords) {

                if (r.matchTelephonyCallbackEvent(
@@ -3582,6 +3586,10 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { 


        synchronized (mRecords) {

            int phoneId = getPhoneIdFromSubId(subId);

            if (!validatePhoneId(phoneId)) {

                loge("Invalid phone ID " + phoneId + " for " + subId);

                return;

            }

            mCarrierRoamingNtnEligible[phoneId] = eligible;

            for (Record r : mRecords) {

                if (r.matchTelephonyCallbackEvent(