Fix NPE in QuickContactActivity
Return Pair of nulls to callers instead of single null when get invalid
request so that they can dereference first and second without null checking
the Pair object itself.
Bug:17360477
Change-Id: I2a11fe4c39e0004aae95c9240b331a4fa654d58a
diff --git a/src/com/android/contacts/common/ContactsUtils.java b/src/com/android/contacts/common/ContactsUtils.java
index 7fa1d1c..4c31367 100644
--- a/src/com/android/contacts/common/ContactsUtils.java
+++ b/src/com/android/contacts/common/ContactsUtils.java
@@ -174,12 +174,12 @@
final boolean isEmail = im.isCreatedFromEmail();
if (!isEmail && !im.isProtocolValid()) {
- return null;
+ return new Pair<>(null, null);
}
final String data = im.getData();
if (TextUtils.isEmpty(data)) {
- return null;
+ return new Pair<>(null, null);
}
final int protocol = isEmail ? Im.PROTOCOL_GOOGLE_TALK : im.getProtocol();