Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1606)

Unified Diff: net/android/unittest_support/AndroidManifest.xml

Issue 1128043007: Support Kerberos on Android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix a nit I had missed. Created 5 years, 6 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
Index: net/android/unittest_support/AndroidManifest.xml
diff --git a/testing/android/native_test/java/AndroidManifest.xml b/net/android/unittest_support/AndroidManifest.xml
similarity index 73%
copy from testing/android/native_test/java/AndroidManifest.xml
copy to net/android/unittest_support/AndroidManifest.xml
index 65050144282dd7fe71fba77ff6f9bfd6f672d164..7d4a00c8460a49bc1a46b0a085d1232ed2526b2f 100644
--- a/testing/android/native_test/java/AndroidManifest.xml
+++ b/net/android/unittest_support/AndroidManifest.xml
@@ -14,9 +14,12 @@ found in the LICENSE file.
<uses-permission android:name="android.permission.BLUETOOTH"/>
<uses-permission android:name="android.permission.BLUETOOTH_ADMIN"/>
<uses-permission android:name="android.permission.CAMERA" />
+ <uses-permission android:name="android.permission.GET_ACCOUNTS"/>
<uses-permission android:name="android.permission.INTERNET"/>
+ <uses-permission android:name="android.permission.MANAGE_ACCOUNTS"/>
<uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"/>
<uses-permission android:name="android.permission.RECORD_AUDIO"/>
+ <uses-permission android:name="android.permission.USE_CREDENTIALS"/>
<uses-permission android:name="android.permission.WAKE_LOCK"/>
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
@@ -30,6 +33,14 @@ found in the LICENSE file.
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
+ <service android:name="org.chromium.net.test.DummySpnegoAuthenticatorService"
+ android:process=":dummyAuthenticator">
Bernhard Bauer 2015/06/10 17:11:03 I think this should be indented 8 spaces.
aberent 2015/06/15 15:52:20 Done.
+ <intent-filter>
+ <action android:name="android.accounts.AccountAuthenticator" />
Bernhard Bauer 2015/06/10 17:11:03 And this four spaces.
aberent 2015/06/15 15:52:19 Done.
+ </intent-filter>
+ <meta-data android:name="android.accounts.AccountAuthenticator"
+ android:resource="@xml/dummy_spnego_authenticator" />
Bernhard Bauer 2015/06/10 17:11:03 And this 8 again :)
aberent 2015/06/15 15:52:19 Done.
+ </service>
</application>
<instrumentation android:name="org.chromium.native_test.NativeTestInstrumentationTestRunner"

Powered by Google App Engine
This is Rietveld 408576698