commit d428026d8fdd524a878895d13a14a6b0a8166b30
author Wenyi Wang <wenyiw@google.com> Wed Aug 31 03:11:38 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Aug 31 03:11:38 2016 +0000
tree 646613630b7e14ad614cd849b5ba31a4f47fceb6
parent 72353f9106022343173a58ba50bc76f77b367321
parent 28583f882553f960c1f12be98cdf1e738bdcf74a

Fix NPE in loading group items am: 6942b708b6
am: 28583f8825

Change-Id: Ide2515e87958d0239c7fe857d9db66ec16e44fff

src/com/android/contacts/group/GroupsFragment.java

diff --git a/src/com/android/contacts/group/GroupsFragment.java b/src/com/android/contacts/group/GroupsFragment.java
index 508c184..522d3ba 100644
--- a/src/com/android/contacts/group/GroupsFragment.java
+++ b/src/com/android/contacts/group/GroupsFragment.java
@@ -56,6 +56,9 @@
 
                 @Override
                 public void onLoadFinished(Loader<Cursor> loader, Cursor data) {
+                    if (data == null) {
+                        return;
+                    }
                     mGroupListItems.clear();
                     for (int i = 0; i < data.getCount(); i++) {
                         if (data.moveToNext()) {