summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcretin45 <cretin45@gmail.com>2016-03-24 11:37:44 -0700
committerEd Carrigan <cretin45@gmail.com>2016-03-24 11:40:42 -0700
commit681f47db087a5ccc9acef54352fd916d9ce23548 (patch)
tree3bfc36afdd2aa079d3efd3f8bf5c62348e86baa5
parent65032f570976ffd03d3e8a80d9a08bb52299cee6 (diff)
downloadandroid_packages_apps_Trebuchet-681f47db087a5ccc9acef54352fd916d9ce23548.tar.gz
android_packages_apps_Trebuchet-681f47db087a5ccc9acef54352fd916d9ce23548.tar.bz2
android_packages_apps_Trebuchet-681f47db087a5ccc9acef54352fd916d9ce23548.zip
Trebuchet: Fix NPE while binding unavailable items
Issue-id: CYNGNOS-2282 Change-Id: I6895c3c043a2b8a9506f3dc2f8a357942d8f35c4 (cherry picked from commit e812052ff07a96e5008fdfea671357c74baf21e3)
-rw-r--r--src/com/android/launcher3/Workspace.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 6114157e0..d5b6de064 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -4375,7 +4375,9 @@ public class Workspace extends PagedView
final int N = folderPagedView.getItemCount();
for (int page = 0; page < N; page++) {
final CellLayout cellLayout = folderPagedView.getPageAt(page);
- updateUnvailableItemsInCellLayout(cellLayout, packages);
+ if (cellLayout != null) {
+ updateUnvailableItemsInCellLayout(cellLayout, packages);
+ }
}
folder.invalidate();
}