commit 606726ba289583a67188d9448b220c2e3fae87d7
author Sunny Goyal <sunnygoyal@google.com> Thu Sep 03 17:12:36 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Sep 03 17:12:36 2015 +0000
tree a8c0c0f936d7660d7ec5383336d36f6bbcd6fea9
parent 667d6888f4a7f1a6267c1968f22fdb8ff3af8d34
parent a75053f5f90b9494cc60a99e2b80b419eb3724b9

Merge "Preventing null pointer crash when opening a folder" into ub-launcher3-burnaby

src/com/android/launcher3/Launcher.java

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 2873d37..1f843cb 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -1865,8 +1865,6 @@
         boolean alreadyOnHome = mHasFocus && ((intent.getFlags() &
                 Intent.FLAG_ACTIVITY_BROUGHT_TO_FRONT)
                 != Intent.FLAG_ACTIVITY_BROUGHT_TO_FRONT);
-        boolean moveToDefaultScreen = mLauncherCallbacks != null ?
-                mLauncherCallbacks.shouldMoveToDefaultScreenOnHomeIntent() : true;
         boolean isActionMain = Intent.ACTION_MAIN.equals(intent.getAction());
         if (isActionMain) {
             // also will cancel mWaitingForResult.
@@ -1920,6 +1918,8 @@
         // as slow logic in the callbacks eat into the time the scroller expects for the snapToPage
         // animation.
         if (isActionMain) {
+            boolean moveToDefaultScreen = mLauncherCallbacks != null ?
+                    mLauncherCallbacks.shouldMoveToDefaultScreenOnHomeIntent() : true;
             if (alreadyOnHome && mState == State.WORKSPACE && !mWorkspace.isTouchActive() &&
                     openFolder == null && moveToDefaultScreen) {
                 mWorkspace.post(new Runnable() {