diff options
| author | Jay Shrauner <shrauner@google.com> | 2014-11-03 20:03:48 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-11-03 20:03:48 +0000 |
| commit | 8581685e1c9a79d5cf167c4a7259562a7f996ad8 (patch) | |
| tree | bdc17a8ef2e3aab237209382cc7234a2f8ded867 /src | |
| parent | 95f85c8ab98b03625f253dc3f355d7bc41911e7c (diff) | |
| parent | 41a08f4e422a9952dc666943374579aa5483cddb (diff) | |
| download | android_packages_apps_ContactsCommon-8581685e1c9a79d5cf167c4a7259562a7f996ad8.tar.gz android_packages_apps_ContactsCommon-8581685e1c9a79d5cf167c4a7259562a7f996ad8.tar.bz2 android_packages_apps_ContactsCommon-8581685e1c9a79d5cf167c4a7259562a7f996ad8.zip | |
Merge "Fix NPE in getTargetFileForDisplay" into lmp-mr1-dev
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/contacts/common/vcard/ExportVCardActivity.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/com/android/contacts/common/vcard/ExportVCardActivity.java b/src/com/android/contacts/common/vcard/ExportVCardActivity.java index 008beb68..b86845e7 100644 --- a/src/com/android/contacts/common/vcard/ExportVCardActivity.java +++ b/src/com/android/contacts/common/vcard/ExportVCardActivity.java @@ -216,6 +216,9 @@ public class ExportVCardActivity extends Activity implements ServiceConnection, * appearance in bidirectional text. */ private String getTargetFileForDisplay() { + if (mTargetFileName == null) { + return null; + } return mBidiFormatter.unicodeWrap(mTargetFileName, TextDirectionHeuristics.LTR); } |