commit 7ac78c2be4701897d8142183317637a1a98a358e
author Jay Shrauner <shrauner@google.com> Wed Sep 03 09:14:16 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Sep 03 09:14:16 2014 +0000
tree 5350a10eb1a9b3e3f4cdb18d380acd3af6f9a235
parent 2df3dd1363074ca70428f855b9b8e8c3b30c7371
parent 69c06ebb5850710b07f8fee06e23fde604b4c5d0

am 69c06ebb: am c656552b: am b973c146: Merge "Fix NPE in QuickContactActivity" into lmp-dev

* commit '69c06ebb5850710b07f8fee06e23fde604b4c5d0':
  Fix NPE in QuickContactActivity

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