diff options
| author | Jorim Jaggi <jjaggi@google.com> | 2014-01-14 23:01:48 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-01-14 23:01:48 +0000 |
| commit | 00c3184fa6fae69123d160b92977799a1a47fa34 (patch) | |
| tree | e15280aab6044882b90fd697c0da720ed38a3f12 /src/com/android | |
| parent | 65b6a603fa972a1bd62298558016eb4712e8c727 (diff) | |
| parent | eedb00a674358bb88dce1e0d3a90bd6cb9e97cfc (diff) | |
| download | android_packages_apps_Trebuchet-00c3184fa6fae69123d160b92977799a1a47fa34.tar.gz android_packages_apps_Trebuchet-00c3184fa6fae69123d160b92977799a1a47fa34.tar.bz2 android_packages_apps_Trebuchet-00c3184fa6fae69123d160b92977799a1a47fa34.zip | |
Merge "Fix NPE in Workspace.onDropCompleted" into jb-ub-now-kermit
Diffstat (limited to 'src/com/android')
| -rw-r--r-- | src/com/android/launcher3/LauncherAppState.java | 4 | ||||
| -rw-r--r-- | src/com/android/launcher3/Workspace.java | 8 |
2 files changed, 11 insertions, 1 deletions
diff --git a/src/com/android/launcher3/LauncherAppState.java b/src/com/android/launcher3/LauncherAppState.java index 156befbe0..29e18f9c0 100644 --- a/src/com/android/launcher3/LauncherAppState.java +++ b/src/com/android/launcher3/LauncherAppState.java @@ -245,4 +245,8 @@ public class LauncherAppState implements DeviceProfile.DeviceProfileCallbacks { return getInstance().mBuildInfo.isDogfoodBuild() && Launcher.isPropertyEnabled(Launcher.DISABLE_ALL_APPS_PROPERTY); } + + public static boolean isDogfoodBuild() { + return getInstance().mBuildInfo.isDogfoodBuild(); + } } diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index 2ce9eb3ad..359fd8640 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -4051,7 +4051,13 @@ public class Workspace extends SmoothPagedView } else { cellLayout = getScreenWithId(mDragInfo.screenId); } - cellLayout.onDropChild(mDragInfo.cell); + if (cellLayout == null && LauncherAppState.isDogfoodBuild()) { + throw new RuntimeException("Invalid state: cellLayout == null in " + + "Workspace#onDropCompleted. Please file a bug. "); + } + if (cellLayout != null) { + cellLayout.onDropChild(mDragInfo.cell); + } } if ((d.cancelled || (beingCalledAfterUninstall && !mUninstallSuccessful)) && mDragInfo.cell != null) { |