commit 25125e77d66febf62c59cda5880f84a1f295817e
author Sunny Goyal <sunnygoyal@google.com> Mon Jun 01 17:42:41 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Jun 01 17:42:41 2015 +0000
tree bb7b2297017f3fd7b4be4865ff0e63045b9e589a
parent 3a3afbf8a06e6008867725c75c09a3271f967701
parent d3d8c958a28aee7815fa2bc81b5c0b79903d51ad

am d3d8c958: Null check in accessibility delegate

* commit 'd3d8c958a28aee7815fa2bc81b5c0b79903d51ad':
  Null check in accessibility delegate

src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java

diff --git a/src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java b/src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java
index eeec8c5..93cf8d0 100644
--- a/src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java
+++ b/src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java
@@ -219,9 +219,13 @@
     }
 
     private ArrayList<Integer> getSupportedResizeActions(View host, LauncherAppWidgetInfo info) {
-        AppWidgetProviderInfo providerInfo = ((LauncherAppWidgetHostView) host).getAppWidgetInfo();
         ArrayList<Integer> actions = new ArrayList<>();
 
+        AppWidgetProviderInfo providerInfo = ((LauncherAppWidgetHostView) host).getAppWidgetInfo();
+        if (providerInfo == null) {
+            return actions;
+        }
+
         CellLayout layout = (CellLayout) host.getParent().getParent();
         if ((providerInfo.resizeMode & AppWidgetProviderInfo.RESIZE_HORIZONTAL) != 0) {
             if (layout.isRegionVacant(info.cellX + info.spanX, info.cellY, 1, info.spanY) ||