🔍 More consistent first run triggering

chrome/android/java/src/org/chromium/chrome/browser/init/AsyncInitializationActivity.java

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.init;
 
 import android.annotation.SuppressLint;
 import android.annotation.TargetApi;
 import android.app.Activity;
 import android.content.Context;
@@ skipping 17 matching lines @@
 
 import org.chromium.base.ApiCompatibilityUtils;
 import org.chromium.base.TraceEvent;
 import org.chromium.base.VisibleForTesting;
 import org.chromium.base.library_loader.LibraryLoader;
 import org.chromium.base.library_loader.LoaderErrors;
 import org.chromium.base.library_loader.ProcessInitException;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.ChromeApplication;
 import org.chromium.chrome.browser.WarmupManager;
+import org.chromium.chrome.browser.firstrun.FirstRunFlowSequencer;
 import org.chromium.chrome.browser.metrics.MemoryUma;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.browser.tabmodel.DocumentModeAssassin;
 import org.chromium.chrome.browser.upgrade.UpgradeActivity;
 import org.chromium.ui.base.ActivityWindowAndroid;
 import org.chromium.ui.base.DeviceFormFactor;
 import org.chromium.ui.base.WindowAndroid;
 
 import java.lang.reflect.Field;
 
@@ skipping 192 matching lines @@
 
             // Kick the user to the MigrationActivity.
             UpgradeActivity.launchInstance(this, getIntent());
 
             // Don't remove this task -- it may be a DocumentActivity that exists only in Recents.
             finish();
             return;
         }
 
         if (!isStartedUpCorrectly(getIntent())) {
-            super.onCreate(null);
-            ApiCompatibilityUtils.finishAndRemoveTask(this);
+            abortLaunch();
             return;
         }
 
+        if (requiresFirstRunToBeCompleted(getIntent())
+                && FirstRunFlowSequencer.launch(this, getIntent(), false)) {
+            abortLaunch();

[Ted C, 2017/04/21 04:41:42]

pre-L, if you call finish in onCreate does it remove the task?  Just making sure
we don't need to do anything in onResume or anything.

[gone, 2017/04/21 17:05:06]

Seems to.  I've been testing on a KK device.

+            return;
+        }
+
         super.onCreate(transformSavedInstanceStateForOnCreate(savedInstanceState));
         mOnCreateTimestampMs = SystemClock.elapsedRealtime();
         mOnCreateTimestampUptimeMs = SystemClock.uptimeMillis();
         mSavedInstanceState = savedInstanceState;
 
         mWindowAndroid = createWindowAndroid();
         if (mWindowAndroid != null) {
             getWindowAndroid().restoreInstanceState(getSavedInstanceState());
         }
 
         if (shouldDelayBrowserStartup()) {
             // Even if the browser startup is being delayed, the UI still has to be inflated.
             setContentView();
             if (mLaunchBehindWorkaround != null) mLaunchBehindWorkaround.onSetContentView();
         } else {
             ChromeBrowserInitializer.getInstance(this).handlePreNativeStartup(this);
         }
     }
 
+    private void abortLaunch() {
+        super.onCreate(null);
+        ApiCompatibilityUtils.finishAndRemoveTask(this);
+    }
+
     /**
      * Call to begin loading the library, if it was delayed.
      */
     protected void beginLoadingLibrary() {
         assert shouldDelayBrowserStartup();
         ChromeBrowserInitializer.getInstance(this).handlePreNativeStartup(this);
     }
 
     /**
      * Creates an {@link ActivityWindowAndroid} to delegate calls to, if the Activity requires it.
@@ skipping 13 matching lines @@
 
     /**
      * Allows subclasses to override the instance state passed to super.onCreate().
      * The original instance state will still be available via getSavedInstanceState().
      */
     protected Bundle transformSavedInstanceStateForOnCreate(Bundle savedInstanceState) {
         return savedInstanceState;
     }
 
     /**
+     * Overriding this function is almost always wrong.
+     * @return Whether or not the user needs to go through First Run before using this Activity.
+     */
+    protected boolean requiresFirstRunToBeCompleted(Intent intent) {
+        return true;
+    }
+
+    /**
      * Whether or not the Activity was started up via a valid Intent.
      */
     protected boolean isStartedUpCorrectly(Intent intent) {
         return true;
     }
 
     /**
      * @return The elapsed real time for the activity creation in ms.
      */
     protected long getOnCreateTimestampUptimeMs() {
@@ skipping 320 matching lines @@
                             getDecorView().setVisibility(View.GONE);
                         }
                         getViewTreeObserver().removeOnPreDrawListener(mPreDrawListener);
                     }
                 });
                 return true;
             }
         };
     }
 }