summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSunny Goyal <sunnygoyal@google.com>2015-06-01 10:09:06 -0700
committerSunny Goyal <sunnygoyal@google.com>2015-06-01 10:10:28 -0700
commitd3d8c958a28aee7815fa2bc81b5c0b79903d51ad (patch)
treed1f5f5148ab4740649557959b5fa89e3ecfe18e7 /src
parent8522c80b4aa7bd955a54aa0abfe855d6132622e9 (diff)
downloadandroid_packages_apps_Trebuchet-d3d8c958a28aee7815fa2bc81b5c0b79903d51ad.tar.gz
android_packages_apps_Trebuchet-d3d8c958a28aee7815fa2bc81b5c0b79903d51ad.tar.bz2
android_packages_apps_Trebuchet-d3d8c958a28aee7815fa2bc81b5c0b79903d51ad.zip
Null check in accessibility delegate
bug: 21338696 Change-Id: I00d67e53e03e33b26a8eadb669b60fec47553f26
Diffstat (limited to 'src')
-rw-r--r--src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java6
1 files changed, 5 insertions, 1 deletions
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) ||