commit 1fd7e1e789c4a6ba8c81d9056b73a9237e2ee921
author Walter Jang <wjang@google.com> Mon Nov 03 20:49:21 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Nov 03 20:49:22 2014 +0000
tree 92b79a3ca03d2a9eedf4a9271bfd2de430da923c
parent 2e637f7e2dad8f0c31088986ac2e7ecdb9930427
parent bd72e369b0050997fe272f8ceae4ca9aa41fbe5f

Merge "Guard against null messages when constructing telephone ttspans" into lmp-mr1-dev

src/com/android/contacts/common/vcard/ExportVCardActivity.java

diff --git a/src/com/android/contacts/common/vcard/ExportVCardActivity.java b/src/com/android/contacts/common/vcard/ExportVCardActivity.java
index 008beb6..b86845e 100644
--- a/src/com/android/contacts/common/vcard/ExportVCardActivity.java
+++ b/src/com/android/contacts/common/vcard/ExportVCardActivity.java
@@ -216,6 +216,9 @@
      * appearance in bidirectional text.
      */
     private String getTargetFileForDisplay() {
+        if (mTargetFileName == null) {
+            return null;
+        }
         return mBidiFormatter.unicodeWrap(mTargetFileName, TextDirectionHeuristics.LTR);
     }