commit cf235922c742d2ad5bca5ddbf31d005f1efe1843
author Hyunyoung Song <hyunyoungs@google.com> Mon Jul 27 22:35:02 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Jul 27 22:35:02 2015 +0000
tree c95599a98ea3f3a46ceb0a45a21ec7e795761fa9
parent a3e8963108b366c3b31a5b09f2e5fd399c3f6e50
parent a9095e07ddd2318ceb81a2794219e07dd112df72

am a9095e07: Remove NPE inside WidgetsListAdapter during monkey actor test b/22518383

* commit 'a9095e07ddd2318ceb81a2794219e07dd112df72':
  Remove NPE inside WidgetsListAdapter during monkey actor test b/22518383

src/com/android/launcher3/widget/WidgetsListAdapter.java

diff --git a/src/com/android/launcher3/widget/WidgetsListAdapter.java b/src/com/android/launcher3/widget/WidgetsListAdapter.java
index d2ea252..a54626a 100644
--- a/src/com/android/launcher3/widget/WidgetsListAdapter.java
+++ b/src/com/android/launcher3/widget/WidgetsListAdapter.java
@@ -87,6 +87,9 @@
 
     @Override
     public int getItemCount() {
+        if (mWidgetsModel == null) {
+            return 0;
+        }
         return mWidgetsModel.getPackageSize();
     }