commit 49f72a708d4c68dd228497a76a9337b41c91b73d
author Narayan Kamath <narayan@google.com> Tue Jul 19 03:45:13 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jul 19 03:45:13 2011 -0700
tree 1b6dd467d7ff089a6d38b24281bd2b80b05e87d3
parent 292c025d06b41c42546e9771b0da0333e08f9db7
parent cb1a4778686a46c46d8dc88b6c83674f6fac6592

Merge "Update the search widget icon if the global search provider changes."

src/com/android/launcher2/Launcher.java

diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index a2e4bd0..5814500 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -1218,7 +1218,7 @@
     };
 
     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);