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

Commit ea0ac814 authored by Shuo Qian's avatar Shuo Qian Committed by Gerrit Code Review
Browse files

Merge "Prevent null check in isEmergencyNumber"

parents 14542836 753b1a3a

src/java/com/android/internal/telephony/emergency/EmergencyNumberTracker.java

+3 −0
Original line number Diff line number Diff line
@@ -366,6 +366,9 @@ public class EmergencyNumberTracker extends Handler { 
     * @return {@code true} if it is; {@code false} otherwise.

     */

    public boolean isEmergencyNumber(String number, boolean exactMatch) {

        if (number == null) {

            return false;

        }

        if (!mEmergencyNumberListFromRadio.isEmpty()) {

            for (EmergencyNumber num : mEmergencyNumberList) {

                // According to com.android.i18n.phonenumbers.ShortNumberInfo, in