commit bc4539df6fd8b0672fbf51a49cba630add5083a3
author Adam Cohen <adamcohen@google.com> Tue Jan 14 14:05:32 2014 -0800
committer Adam Cohen <adamcohen@google.com> Tue Jan 14 16:24:16 2014 -0800
tree e4fdeb8f9ccd5a051e690dd9110dc2f83033cffb
parent c83d136ce4a7bde768cbea4d4b263ab6e4eaa9f1

Ensure that hasFirstRunActivity is only called when necessary

Change-Id: I834abcd82f46c6f096f5c92452b34c668a4a3d86

src/com/android/launcher3/Launcher.java

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 765fca4..93852ef 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -4304,12 +4304,13 @@
     }
 
     private boolean shouldRunFirstRunActivity() {
-        return !ActivityManager.isRunningInTestHarness();
+        return !ActivityManager.isRunningInTestHarness() &&
+                !mSharedPrefs.getBoolean(FIRST_RUN_ACTIVITY_DISPLAYED, false);
     }
 
     public void showFirstRunActivity() {
-        if (shouldRunFirstRunActivity() && hasFirstRunActivity()
-                && !mSharedPrefs.getBoolean(FIRST_RUN_ACTIVITY_DISPLAYED, false)) {
+        if (shouldRunFirstRunActivity() &&
+                hasFirstRunActivity()) {
             Intent firstRunIntent = getFirstRunActivity();
             if (firstRunIntent != null) {
                 startActivity(firstRunIntent);