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

Commit 8164603b authored by Jay Shrauner's avatar Jay Shrauner Committed by The Android Automerger
Browse files

Fix NPE when calling unicodeWrap DO NOT MERGE 

unicodeWrap isn't null safe so check before calling

Bug:18086401
Change-Id: I74537fff226276733b0475029b4a4a57a0055244
(cherry picked from commit b2215766)
parent dd79faa7

src/com/android/contacts/interactions/CallLogInteraction.java

+4 −3
Original line number Diff line number Diff line
@@ -161,8 +161,9 @@ public class CallLogInteraction implements ContactInteraction { 
    }



    public String getNumber() {

        return sBidiFormatter.unicodeWrap(

                mValues.getAsString(Calls.NUMBER), TextDirectionHeuristics.LTR);

        final String number = mValues.getAsString(Calls.NUMBER);

        return number == null ? null :

            sBidiFormatter.unicodeWrap(number, TextDirectionHeuristics.LTR);

    }



    public Integer getNumberPresentation() {

src/com/android/contacts/interactions/SmsInteraction.java

+3 −2
Original line number Diff line number Diff line
@@ -92,8 +92,9 @@ public class SmsInteraction implements ContactInteraction { 
    }



    public String getAddress() {

        return sBidiFormatter.unicodeWrap(

                mValues.getAsString(Sms.ADDRESS), TextDirectionHeuristics.LTR);

        final String address = mValues.getAsString(Sms.ADDRESS);

        return address == null ? null :

            sBidiFormatter.unicodeWrap(address, TextDirectionHeuristics.LTR);

    }



    public String getBody() {