diff options
author | Adam Cohen <adamcohen@google.com> | 2013-12-03 17:59:52 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-12-03 17:59:52 -0800 |
commit | 531a5c324e20b354a674851fd4808c105a80af3a (patch) | |
tree | 2a0c074524d01269f425b563f66c13230cbc1dce /src | |
parent | b4ee57927224429e34e3a81519b2ea658e41fc45 (diff) | |
parent | b0ee08109ec89959d9bbd526c6e5f7ab96c8c3ea (diff) | |
download | android_packages_apps_Trebuchet-531a5c324e20b354a674851fd4808c105a80af3a.tar.gz android_packages_apps_Trebuchet-531a5c324e20b354a674851fd4808c105a80af3a.tar.bz2 android_packages_apps_Trebuchet-531a5c324e20b354a674851fd4808c105a80af3a.zip |
am b0ee0810: Add guards for restoreInstanceState (issue 11982812)
* commit 'b0ee08109ec89959d9bbd526c6e5f7ab96c8c3ea':
Add guards for restoreInstanceState (issue 11982812)
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/launcher3/LauncherModel.java | 2 | ||||
-rw-r--r-- | src/com/android/launcher3/Workspace.java | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java index 4d9dff93a..74f28b304 100644 --- a/src/com/android/launcher3/LauncherModel.java +++ b/src/com/android/launcher3/LauncherModel.java @@ -2298,7 +2298,7 @@ public class LauncherModel extends BroadcastReceiver { r = new Runnable() { public void run() { Callbacks callbacks = tryGetCallbacks(oldCallbacks); - if (callbacks != null) { + if (callbacks != null && currentScreen >= 0) { callbacks.onPageBoundSynchronously(currentScreen); } } diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index e4ba743be..da1dbfee6 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -4264,7 +4264,9 @@ public class Workspace extends SmoothPagedView if (mSavedStates != null) { mRestoredPages.add(child); CellLayout cl = (CellLayout) getChildAt(child); - cl.restoreInstanceState(mSavedStates); + if (cl != null) { + cl.restoreInstanceState(mSavedStates); + } } } |