diff options
| author | Adam Cohen <adamcohen@google.com> | 2013-12-03 10:51:45 -0800 |
|---|---|---|
| committer | Adam Cohen <adamcohen@google.com> | 2013-12-03 10:52:21 -0800 |
| commit | b0ee08109ec89959d9bbd526c6e5f7ab96c8c3ea (patch) | |
| tree | ac35acc9283717d5bc80aa7280d380af3cc2bc65 /src | |
| parent | b3084e87fcf7b617899b3c858d5372d079e0fe36 (diff) | |
| download | android_packages_apps_Trebuchet-b0ee08109ec89959d9bbd526c6e5f7ab96c8c3ea.tar.gz android_packages_apps_Trebuchet-b0ee08109ec89959d9bbd526c6e5f7ab96c8c3ea.tar.bz2 android_packages_apps_Trebuchet-b0ee08109ec89959d9bbd526c6e5f7ab96c8c3ea.zip | |
Add guards for restoreInstanceState (issue 11982812)
Change-Id: Ic4c632a956130ab28843085490dc1badb39b0e8c
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 3b7afc761..c6c6e1371 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -4254,7 +4254,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); + } } } |