chrome/android/java/src/org/chromium/chrome/browser/init/NativeInitializationController.java - Issue 2884743002: Fix timing bug in delayed async initialization on Android.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/init/NativeInitializationController.java

Issue 2884743002: Fix timing bug in delayed async initialization on Android. (Closed)

Patch Set: Created 3 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/android/java/src/org/chromium/chrome/browser/init/ChromeActivityNativeDelegate.java ('k') | chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchActivity.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/java/src/org/chromium/chrome/browser/init/NativeInitializationController.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/NativeInitializationController.java b/chrome/android/java/src/org/chromium/chrome/browser/init/NativeInitializationController.java

index 5cc01c8061ab0a82adada3a01deb04338d87d731..ec86c0e34ae6b8165e66f43d29018712367a54b5 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/init/NativeInitializationController.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/init/NativeInitializationController.java

@@ -36,7 +36,7 @@ class NativeInitializationController {

private List<Intent> mPendingNewIntents;

private List<ActivityResult> mPendingActivityResults;

- private boolean mBackgroundTasksComplete;

+ private Boolean mBackgroundTasksComplete;

private boolean mHasDoneFirstDraw;

private boolean mHasSignaledLibraryLoaded;

private boolean mInitializationComplete;

@@ -76,7 +76,7 @@ class NativeInitializationController {

public void startBackgroundTasks(final boolean allocateChildConnection) {

ThreadUtils.assertOnUiThread();

+ assert mBackgroundTasksComplete == null;

boolean fetchVariationsSeed = FirstRunFlowSequencer.checkIfFirstRunIsNecessary(

ContextUtils.getApplicationContext(),

mActivityDelegate.getInitialIntent(), false)

@@ -108,7 +108,7 @@ class NativeInitializationController {

ThreadUtils.assertOnUiThread();

// Called on UI thread when any of the booleans below have changed.

- if (mHasDoneFirstDraw && mBackgroundTasksComplete) {

+ if (mHasDoneFirstDraw && (mBackgroundTasksComplete != null && mBackgroundTasksComplete)) {

// This block should only be hit once.

assert !mHasSignaledLibraryLoaded;

mHasSignaledLibraryLoaded = true;