summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2012-06-05 16:01:23 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-06-05 16:01:23 -0700
commit3e95341fec02b877ee2b97eb03d4a10aa501efb1 (patch)
treec4ab56328687dfc95d21ba54609d532010a78024
parentd63e27eed277485df45fa2a719b4878a8ec31215 (diff)
parent67640c0cbe27e6c83b69070d23ea50c4a6f18447 (diff)
downloadandroid_packages_apps_Trebuchet-3e95341fec02b877ee2b97eb03d4a10aa501efb1.tar.gz
android_packages_apps_Trebuchet-3e95341fec02b877ee2b97eb03d4a10aa501efb1.tar.bz2
android_packages_apps_Trebuchet-3e95341fec02b877ee2b97eb03d4a10aa501efb1.zip
am 67640c0c: Workaround for crashing on rotation. (Bug 6611883)
* commit '67640c0cbe27e6c83b69070d23ea50c4a6f18447': Workaround for crashing on rotation. (Bug 6611883)
-rw-r--r--src/com/android/launcher2/Launcher.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index 9cae5e596..105d9436b 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -704,7 +704,8 @@ public final class Launcher extends Activity
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);