From: Sunny Goyal <sunnygoyal@google.com>
Date: Mon, 1 Jun 2015 17:09:06 +0000 (-0700)
Subject: Null check in accessibility delegate
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=d3d8c958a28aee7815fa2bc81b5c0b79903d51ad;p=android-x86%2Fpackages-apps-Trebuchet.git

Null check in accessibility delegate

bug: 21338696
Change-Id: I00d67e53e03e33b26a8eadb669b60fec47553f26
---

diff --git a/src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java b/src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java
index eeec8c580..93cf8d050 100644
--- a/src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java
+++ b/src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java
@@ -219,9 +219,13 @@ public class LauncherAccessibilityDelegate extends AccessibilityDelegate {
     }
 
     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) ||