commit ee01af700f683cc8d3e19578fe8f7f53d40a9873
author Yorke Lee <yorkelee@google.com> Thu Dec 05 20:37:41 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Dec 05 20:37:42 2013 +0000
tree 82b141f1029a96a67a0d379a24e8e1ec537d4d7b
parent 5fe2d21baf3de9bb8d16dcce8d4fd60652df9441
parent 1e94cb5d34c52c528b8210f719547fc5603593ce

Merge "Add null check for cursor in DirectoryListLoader"

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

diff --git a/src/com/android/contacts/common/list/DirectoryListLoader.java b/src/com/android/contacts/common/list/DirectoryListLoader.java
index be9a8e9..dedd62e 100644
--- a/src/com/android/contacts/common/list/DirectoryListLoader.java
+++ b/src/com/android/contacts/common/list/DirectoryListLoader.java
@@ -147,6 +147,9 @@
 
         Cursor cursor = context.getContentResolver().query(DirectoryQuery.URI,
                 DirectoryQuery.PROJECTION, selection, null, DirectoryQuery.ORDER_BY);
+        if (cursor == null) {
+            return result;
+        }
         try {
             while(cursor.moveToNext()) {
                 long directoryId = cursor.getLong(DirectoryQuery.ID);