commit 49dbee1b8f079d1aeac08576e1917adfa21177c4
author Jay Shrauner <shrauner@google.com> Thu Jan 30 14:02:18 2014 -0800
committer Jay Shrauner <shrauner@google.com> Thu Jan 30 15:38:14 2014 -0800
tree d6ef6aba5da68840a4eb3d994f17d2818d5eade6
parent 9f6cd41a07c29d330a402d5bf04658249837a7cd

Fix NPE if contactsCursor is null

Don't crash if the CP2 call failed and we were unable to load the
contacts cursor.

Bug:12822702
Change-Id: Ib6b3cf5a9519d61c82924f29babb146888f7453a

src/com/android/contacts/common/list/ProfileAndContactsLoader.java

diff --git a/src/com/android/contacts/common/list/ProfileAndContactsLoader.java b/src/com/android/contacts/common/list/ProfileAndContactsLoader.java
index e31b8ec..76715db 100644
--- a/src/com/android/contacts/common/list/ProfileAndContactsLoader.java
+++ b/src/com/android/contacts/common/list/ProfileAndContactsLoader.java
@@ -64,7 +64,7 @@
             @Override
             public Bundle getExtras() {
                 // Need to get the extras from the contacts cursor.
-                return contactsCursor.getExtras();
+                return contactsCursor == null ? new Bundle() : contactsCursor.getExtras();
             }
         };
     }