chrome/android/java/src/org/chromium/chrome/browser/sync/ChromiumSyncAdapter.java - Issue 827123006: Revert of Reverting due to Android builders breakage. Subsequent fixes did not fix.

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/sync/ChromiumSyncAdapter.java

Issue 827123006: Revert of Reverting due to Android builders breakage. Subsequent fixes did not fix. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 11 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/preferences/Preferences.java ('k') | chrome/android/java/src/org/chromium/chrome/browser/sync/ProfileSyncService.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/sync/ChromiumSyncAdapter.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/sync/ChromiumSyncAdapter.java b/chrome/android/java/src/org/chromium/chrome/browser/sync/ChromiumSyncAdapter.java

index d6bf3540e7b0b78e4cf99f3a9f4b4fba2435defc..e4b0746b40b81de3ed9056cf9ffa00e4c8a5c0aa 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/sync/ChromiumSyncAdapter.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/sync/ChromiumSyncAdapter.java

@@ -19,6 +19,7 @@

import org.chromium.base.ThreadUtils;

import org.chromium.base.VisibleForTesting;

+import org.chromium.base.annotations.SuppressFBWarnings;

import org.chromium.base.library_loader.ProcessInitException;

import org.chromium.chrome.browser.invalidation.InvalidationServiceFactory;

import org.chromium.chrome.browser.profiles.Profile;

@@ -102,6 +103,7 @@

try {

ThreadUtils.runOnUiThreadBlocking(new Runnable() {

@Override

+ @SuppressFBWarnings("DM_EXIT")

public void run() {

ContentApplication.initCommandLine(getContext());

if (mAsyncStartup) {

@@ -126,6 +128,7 @@

}

+ @SuppressFBWarnings("DM_EXIT")

private void startBrowserProcessesSync(

final BrowserStartupController.StartupCallback callback) {

try {