commit 714ee29c22ab76d20a13231d0f4686f0aa5164e1
author Jay Shrauner <shrauner@google.com> Mon Nov 03 08:14:59 2014 -0800
committer Jay Shrauner <shrauner@google.com> Mon Nov 03 08:14:59 2014 -0800
tree 6121a357e375906668624feaba108968204a4d2b
parent d46781c636ef01a38e7aa8e97f0e246958e83d61

Fix NPE in getTargetFileForDisplay

Check for null string before calling BidiFormatter.unicodeWrap

Bug:18216877
Change-Id: I979b38cc508d44e82978e0684190797f9bd8807e

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);
     }