summaryrefslogtreecommitdiff
path: root/src/com
diff options
context:
space:
mode:
authorMichael W <baddaemon87@gmail.com>2017-08-23 00:04:58 +0200
committerqjohn <townex22@gmail.com>2017-12-29 06:34:20 +0000
commita4e947207bb763156ebe2dff0c63c7942184f47b (patch)
tree5850a82f16b845f33da4054c1e74ac84adf33768 /src/com
parentb03b4532303bd7b28e705a03dcfe0fed139a3117 (diff)
ContactsCommon: Fix possible NPEHEADn7.1
* Importing a VCard via NFC creates ImportRequest objects with their uri being null * Calling toString() on that uri causes an NPE * Use String.valueOf() to get a String, not an exception * This occurs because the DEBUG flag is always set, otherwise it would not occur anyway BUGBASH-966 Change-Id: I1f7165dbe0327bd24d6f7f6fc9ebaa4b920019c4
Diffstat (limited to 'src/com')
-rw-r--r--src/com/android/contacts/common/vcard/VCardService.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/contacts/common/vcard/VCardService.java b/src/com/android/contacts/common/vcard/VCardService.java
index fa9193d3..bda64f29 100644
--- a/src/com/android/contacts/common/vcard/VCardService.java
+++ b/src/com/android/contacts/common/vcard/VCardService.java
@@ -162,7 +162,7 @@ public class VCardService extends Service {
final ArrayList<String> uris = new ArrayList<String>();
final ArrayList<String> displayNames = new ArrayList<String>();
for (ImportRequest request : requests) {
- uris.add(request.uri.toString());
+ uris.add(String.valueOf(request.uri));
displayNames.add(request.displayName);
}
Log.d(LOG_TAG,