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

Commit a60f461b authored by Shuo Qian's avatar Shuo Qian Committed by android-build-merger
Browse files

Merge "Prevent null check in isEmergencyNumber" am: ea0ac814 

am: d1df1f01

Change-Id: I3dd8bdcd2e209217fa965dfea6bc848149a917c8
parents 95a60e07 d1df1f01

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