summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAdam Cohen <adamcohen@google.com>2011-07-18 13:55:17 -0700
committerAdam Cohen <adamcohen@google.com>2011-07-18 13:55:17 -0700
commit292c025d06b41c42546e9771b0da0333e08f9db7 (patch)
tree1e18293a73517ece2114b5fcbd1504971b7716ee /src
parent234c4cd54406e363a2ebc213f6ae5be284414988 (diff)
downloadandroid_packages_apps_Trebuchet-292c025d06b41c42546e9771b0da0333e08f9db7.tar.gz
android_packages_apps_Trebuchet-292c025d06b41c42546e9771b0da0333e08f9db7.tar.bz2
android_packages_apps_Trebuchet-292c025d06b41c42546e9771b0da0333e08f9db7.zip
Fix bug 4904696, null pointer exception for widget that's not found
Change-Id: I3af50808e312cbe5f8e62a3b17e3e8c1f7d9e3e0
Diffstat (limited to 'src')
-rw-r--r--src/com/android/launcher2/Launcher.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index 489f3fbb8..803760a35 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -1217,7 +1217,7 @@ public final class Launcher extends Activity
};
void addWidgetToAutoAdvanceIfNeeded(View hostView, AppWidgetProviderInfo appWidgetInfo) {
- if (appWidgetInfo.autoAdvanceViewId == -1) return;
+ if (appWidgetInfo == null || appWidgetInfo.autoAdvanceViewId == -1) return;
View v = hostView.findViewById(appWidgetInfo.autoAdvanceViewId);
if (v instanceof Advanceable) {
mWidgetsToAdvance.put(hostView, appWidgetInfo);