commit ee0ce2b29f9cb06cc143c6f30ffc77f4915b0da9
author Michael Jurka <mikejurka@google.com> Tue Jul 02 17:24:35 2013 -0700
committer Michael Jurka <mikejurka@google.com> Tue Jul 02 17:24:35 2013 -0700
tree 2317c953a2548f50a7bcaa0080dc1432fceb16d3
parent 04d554afcb5eeeaf5727c922e70d71817ec2d4af

Fix NPE when drags are cancelled

src/com/android/launcher3/Workspace.java

diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 9ee69be..16c52de 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -499,9 +499,9 @@
         CellLayout newScreen = (CellLayout)
                 mLauncher.getLayoutInflater().inflate(R.layout.workspace_screen, null);
 
-        addView(newScreen, getChildCount());
         mWorkspaceScreens.put(screenId, newScreen);
         mScreenOrder.add(screenId);
+        addView(newScreen, getChildCount());
         if (updateDb) {
             // On bind we don't need to update the screens in the database.
             mLauncher.getModel().updateWorkspaceScreenOrder(mLauncher, mScreenOrder);
@@ -525,10 +525,10 @@
         AppWidgetHostView.getDefaultPaddingForWidget(mLauncher, mLauncher.getComponentName(), p);
         customContent.setPadding(p.left, p.top, p.right, p.bottom);
 
-        addView(customScreen, 0);
-
         mWorkspaceScreens.put(CUSTOM_CONTENT_SCREEN_ID, customScreen);
         mScreenOrder.add(0, CUSTOM_CONTENT_SCREEN_ID);
+        addView(customScreen, 0);
+
 
         // Ensure that the current page and default page are maintained.
         mDefaultPage++;