commit 3e95341fec02b877ee2b97eb03d4a10aa501efb1
author Winson Chung <winsonc@google.com> Tue Jun 05 16:01:23 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Jun 05 16:01:23 2012 -0700
tree c4ab56328687dfc95d21ba54609d532010a78024
parent d63e27eed277485df45fa2a719b4878a8ec31215
parent 67640c0cbe27e6c83b69070d23ea50c4a6f18447

am 67640c0c: Workaround for crashing on rotation. (Bug 6611883)

* commit '67640c0cbe27e6c83b69070d23ea50c4a6f18447':
  Workaround for crashing on rotation. (Bug 6611883)

src/com/android/launcher2/Launcher.java

diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index 9cae5e5..105d943 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -704,7 +704,8 @@
                 AppWidgetProviderInfo pInfo = lahv.getAppWidgetInfo();
 
                 // Remove the current widget which is inflated with the wrong orientation
-                getWorkspace().getParentCellLayoutForView(lahv).removeView(lahv);
+                CellLayout cl = getWorkspace().getParentCellLayoutForView(lahv);
+                if (cl != null) cl.removeView(lahv);
                 // Re-inflate the widget using the correct orientation
                 AppWidgetHostView widget = mAppWidgetHost.createView(this, info.appWidgetId, pInfo);