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

Commit e926d6c2 authored by Jay Shrauner's avatar Jay Shrauner
Browse files

Fix crash when number is null 

Fix crash in various routines when the number is null.

Bug:11766758
Change-Id: I3bcedbd8ada663a8c47528f32e213f653195fe57
(cherry picked from commit 21d991ee)
parent b0b153f5

src/com/android/dialer/calllog/PhoneNumberUtilsWrapper.java

+4 −4
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ public class PhoneNumberUtilsWrapper { 
     * mock-out this, it is not a static method.

     */

    public boolean isVoicemailNumber(CharSequence number) {

        return PhoneNumberUtils.isVoiceMailNumber(number.toString());

        return number!= null && PhoneNumberUtils.isVoiceMailNumber(number.toString());

    }



    /**
@@ -58,7 +58,7 @@ public class PhoneNumberUtilsWrapper { 
     * static method.

     */

    public boolean isSipNumber(CharSequence number) {

        return PhoneNumberUtils.isUriNumber(number.toString());

        return number != null && PhoneNumberUtils.isUriNumber(number.toString());

    }



    public static boolean isUnknownNumberThatCanBeLookedUp(CharSequence number, int presentation) {
@@ -77,13 +77,13 @@ public class PhoneNumberUtilsWrapper { 
        if (new PhoneNumberUtilsWrapper().isVoicemailNumber(number)) {

            return false;

        }

        if (isLegacyUnknownNumbers(number.toString())) {

        if (isLegacyUnknownNumbers(number)) {

            return false;

        }

        return true;

    }



    public static boolean isLegacyUnknownNumbers(CharSequence number) {

        return LEGACY_UNKNOWN_NUMBERS.contains(number.toString());

        return number != null && LEGACY_UNKNOWN_NUMBERS.contains(number.toString());

    }

}