summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcretin45 <cretin45@gmail.com>2015-12-21 10:10:47 -0800
committerAbhisek Devkota <ciwrl@cyanogenmod.com>2016-03-17 14:19:12 -0700
commitdcc1e85a1b2def255253dcee81d0adcc062e740b (patch)
tree33af0495f07e962041df41ce8c052db23dea0312
parenteabe83a05f8f2d30179e733e0269d6d6e6c4312c (diff)
downloadandroid_packages_apps_Trebuchet-dcc1e85a1b2def255253dcee81d0adcc062e740b.tar.gz
android_packages_apps_Trebuchet-dcc1e85a1b2def255253dcee81d0adcc062e740b.tar.bz2
android_packages_apps_Trebuchet-dcc1e85a1b2def255253dcee81d0adcc062e740b.zip
Trebuchet: Prevent crashes on view id mess up
Same fix as: https://github.com/CyanogenMod/android_packages_apps_Trebuchet/commit/33a152fa Issue-id: YAM-226 Change-Id: I558ef03b0299cefc3efd5e51f2ca6542836e66ff (cherry picked from commit d3d67745a76453ca4c259ef052b90b6edd588e4f)
-rw-r--r--src/com/android/launcher3/Launcher.java18
1 files changed, 15 insertions, 3 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 1dafd1245..d6704c81a 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -2357,9 +2357,21 @@ public class Launcher extends Activity
@Override
public void onRestoreInstanceState(Bundle state) {
- super.onRestoreInstanceState(state);
- for (int page: mSynchronouslyBoundPages) {
- mWorkspace.restoreInstanceStateForChild(page);
+ /*
+ * Prevent crashes on view id mess up
+ * See: https://github.com/CyanogenMod/android_packages_apps_Trebuchet/commit/33a152fa
+ */
+ try {
+ super.onRestoreInstanceState(state);
+ for (int page: mSynchronouslyBoundPages) {
+ mWorkspace.restoreInstanceStateForChild(page);
+ }
+ } catch (IllegalArgumentException ex) {
+ if (LauncherAppState.isDogfoodBuild()) {
+ throw ex;
+ }
+ // Mismatched viewId / viewType preventing restore. Skip restore on production builds.
+ Log.e(TAG, "Ignoring an error while restoring a view instance state", ex);
}
}