commit fda11a1730cdd4ef20f434f95bc671b26a78f041
author Jay Shrauner <shrauner@google.com> Tue Feb 04 08:42:04 2014 -0800
committer Jay Shrauner <shrauner@google.com> Tue Mar 04 02:54:04 2014 +0000
tree 878192eeda8125cd7ddebadb604dba5e94d3c806
parent 1331d089ebf15a13839de72aaa753467340bbf13

Fix search crash

Trap NPEs thrown by CP2 query so faulty directory providers don't crash us.

Bug:12893832
Change-Id: Ie88aafb84b6d7129da02d6e0a4457ecfad5ca9b5
(cherry picked from commit ae961fff72fd6612ccad09c9aa63e5ebabd826ea)

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 76715db..c19737d 100644
--- a/src/com/android/contacts/common/list/ProfileAndContactsLoader.java
+++ b/src/com/android/contacts/common/list/ProfileAndContactsLoader.java
@@ -58,7 +58,13 @@
         }
         // ContactsCursor.loadInBackground() can return null; MergeCursor
         // correctly handles null cursors.
-        final Cursor contactsCursor = super.loadInBackground();
+        Cursor cursor = null;
+        try {
+            cursor = super.loadInBackground();
+        } catch (NullPointerException e) {
+            // Ignore NPEs thrown by providers
+        }
+        final Cursor contactsCursor = cursor;
         cursors.add(contactsCursor);
         return new MergeCursor(cursors.toArray(new Cursor[cursors.size()])) {
             @Override