commit 2e637f7e2dad8f0c31088986ac2e7ecdb9930427
author Jay Shrauner <shrauner@google.com> Mon Nov 03 20:03:48 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Nov 03 20:03:48 2014 +0000
tree ff10fa6b935f39d7ccb034c47e1000a419dddc06
parent b5047da9c81ed5ee593d0fbd05ca29e0e0777629
parent 714ee29c22ab76d20a13231d0f4686f0aa5164e1

Merge "Fix NPE in getTargetFileForDisplay" 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);
     }