aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-19 02:38:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix NPE in Workspace.onDropCompleted

Browse Source 
Bug: 11627757
Change-Id: I9dc86856d4bc00253d6350d157be541a8c46888d
This commit is contained in:
Jorim Jaggi
2014-01-13 13:45:07 -08:00
parent 8b5b05b7f3
commit eedb00a674
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/launcher3/LauncherAppState.java
View File

@@ -238,4 +238,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();
}
}

8
src/com/android/launcher3/Workspace.java
View File

@@ -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) {