components/cronet/android/test/javaperftests/AndroidManifest.xml - Issue 1536433002: [Cronet] Get Cronet performance test running again

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: components/cronet/android/test/javaperftests/AndroidManifest.xml

Issue 1536433002: [Cronet] Get Cronet performance test running again (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: ignore netty proguard errors Created 4 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:

Index: components/cronet/android/test/javaperftests/AndroidManifest.xml

diff --git a/components/cronet/android/test/javaperftests/AndroidManifest.xml b/components/cronet/android/test/javaperftests/AndroidManifest.xml

index 8856ac63480204bb8cee5c3c1b933de3d5e8ae55..166e3e2e61843b7eb740eb5092ddfa59a1f182a2 100644

--- a/components/cronet/android/test/javaperftests/AndroidManifest.xml

+++ b/components/cronet/android/test/javaperftests/AndroidManifest.xml

@@ -6,8 +6,11 @@

<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>

<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>

+ <!-- Used to use Theme.NoDisplay but this is no longer the recommended

+ way and crashes in Android Marshmallow.

+ https://plus.google.com/105051985738280261832/posts/LjnRzJKWPGW -->

<activity android:name="CronetPerfTestActivity"

- android:theme="@android:style/Theme.NoDisplay">

+ android:theme="@android:style/Theme.Translucent.NoTitleBar">

<intent-filter>