commit 420ea60333d790d80f4a33b6cacfed383882fc00
author Jay Shrauner <shrauner@google.com> Tue Sep 02 22:47:59 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Sep 02 22:48:00 2014 +0000
tree 08eebed9d7fad62d50bb2b34ba0a5730ebbc1b2d
parent 85d470376626fa573aa54102db31cdd91a038a9e
parent 5c798a938676726e75b9fc3b02df311d12b613e3

Merge "Fix NPE in QuickContactActivity" into lmp-dev

src/com/android/contacts/common/ContactsUtils.java

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();