diff options
| author | Jay Shrauner <shrauner@google.com> | 2014-11-03 08:14:59 -0800 |
|---|---|---|
| committer | Jay Shrauner <shrauner@google.com> | 2014-11-03 08:14:59 -0800 |
| commit | 41a08f4e422a9952dc666943374579aa5483cddb (patch) | |
| tree | a602902c85a5721a028b8f8ca1a0ff96e1c912b5 /src | |
| parent | 3ca0571e873c6e5e109f1807c2a511edec31867a (diff) | |
| download | android_packages_apps_ContactsCommon-41a08f4e422a9952dc666943374579aa5483cddb.tar.gz android_packages_apps_ContactsCommon-41a08f4e422a9952dc666943374579aa5483cddb.tar.bz2 android_packages_apps_ContactsCommon-41a08f4e422a9952dc666943374579aa5483cddb.zip | |
Fix NPE in getTargetFileForDisplay
Check for null string before calling BidiFormatter.unicodeWrap
Bug:18216877
Change-Id: I979b38cc508d44e82978e0684190797f9bd8807e
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); } |