content/shell/android/browsertests_apk/src/org/chromium/content_browsertests_apk/ContentBrowserTestsActivity.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: content/shell/android/browsertests_apk/src/org/chromium/content_browsertests_apk/ContentBrowserTestsActivity.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 | « content/public/android/javatests/src/org/chromium/content/browser/JavaBridgeTestBase.java ('k') | content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellActivity.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/shell/android/browsertests_apk/src/org/chromium/content_browsertests_apk/ContentBrowserTestsActivity.java

diff --git a/content/shell/android/browsertests_apk/src/org/chromium/content_browsertests_apk/ContentBrowserTestsActivity.java b/content/shell/android/browsertests_apk/src/org/chromium/content_browsertests_apk/ContentBrowserTestsActivity.java

index f00dfd16085f6c37c8e57be49fe1b9622a945f9c..5472c30d8fc5fe13d5c5ea9253c6f4f1566ae394 100644

--- a/content/shell/android/browsertests_apk/src/org/chromium/content_browsertests_apk/ContentBrowserTestsActivity.java

+++ b/content/shell/android/browsertests_apk/src/org/chromium/content_browsertests_apk/ContentBrowserTestsActivity.java

@@ -12,6 +12,7 @@

import android.view.View;

import org.chromium.base.JNINamespace;

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

import org.chromium.base.library_loader.LibraryLoader;

import org.chromium.base.library_loader.ProcessInitException;

import org.chromium.content.browser.BrowserStartupController;

@@ -30,6 +31,7 @@

private WindowAndroid mWindowAndroid;

@Override

+ @SuppressFBWarnings("DM_EXIT")

public void onCreate(Bundle savedInstanceState) {

super.onCreate(savedInstanceState);