commit 8164603be5a79e5f95ef4d404a07a7f21f25af9a
author Jay Shrauner <shrauner@google.com> Wed Oct 22 09:02:53 2014 -0700
committer The Android Automerger <android-build@google.com> Wed Oct 22 17:44:40 2014 -0700
tree 2f3abc83d349249c789c4116835dcb0632957bc1
parent dd79faa7ab0c13da7e7153faa4470c37f033b57e

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 b2215766433478ac1c53d61c08f4844326dfe4f8)

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

diff --git a/src/com/android/contacts/interactions/CallLogInteraction.java b/src/com/android/contacts/interactions/CallLogInteraction.java
index f751ae7..89ca3fb 100644
--- a/src/com/android/contacts/interactions/CallLogInteraction.java
+++ b/src/com/android/contacts/interactions/CallLogInteraction.java
@@ -161,8 +161,9 @@
     }
 
     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() {
@@ -210,4 +211,4 @@
     public int getIconResourceId() {
         return CALL_LOG_ICON_RES;
     }
-}
\ No newline at end of file
+}

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

diff --git a/src/com/android/contacts/interactions/SmsInteraction.java b/src/com/android/contacts/interactions/SmsInteraction.java
index 8b26023..8e61213 100644
--- a/src/com/android/contacts/interactions/SmsInteraction.java
+++ b/src/com/android/contacts/interactions/SmsInteraction.java
@@ -92,8 +92,9 @@
     }
 
     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() {