diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-08-28 17:30:52 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-08-28 17:30:52 +0200 |
| commit | faf23e4655d990e965b84f13397a53347812f6dc (patch) | |
| tree | 05fce5d74058f6bd7b3a528a5f2221190dae233f /OpenKeychain/src/main/AndroidManifest.xml | |
| parent | 765ec094c9415fcaddd65b7b743179b2ea7dc098 (diff) | |
| parent | 76522d90faa5a8727493a34786b4490919defc67 (diff) | |
| download | open-keychain-faf23e4655d990e965b84f13397a53347812f6dc.tar.gz open-keychain-faf23e4655d990e965b84f13397a53347812f6dc.tar.bz2 open-keychain-faf23e4655d990e965b84f13397a53347812f6dc.zip | |
Merge branch 'mgeier63-master'
Diffstat (limited to 'OpenKeychain/src/main/AndroidManifest.xml')
| -rw-r--r-- | OpenKeychain/src/main/AndroidManifest.xml | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/OpenKeychain/src/main/AndroidManifest.xml b/OpenKeychain/src/main/AndroidManifest.xml index f8708722a..02cdacb6e 100644 --- a/OpenKeychain/src/main/AndroidManifest.xml +++ b/OpenKeychain/src/main/AndroidManifest.xml @@ -760,8 +760,9 @@ android:configChanges="orientation|screenSize|keyboardHidden|keyboard" android:exported="false" /> - <!-- OpenPGP Remote API, this service has explicitly no permission requirements - because we are using our own package based allow/disallow system --> + <!-- DEPRECATED service, + using this service may lead to truncated data being returned to the caller + --> <service android:name=".remote.OpenPgpService" android:enabled="true" @@ -773,6 +774,19 @@ </intent-filter> </service> + <!-- OpenPGP Remote API, this service has explicitly no permission requirements + because we are using our own package based allow/disallow system --> + <service + android:name=".remote.OpenPgpService2" + android:enabled="true" + android:exported="true" + android:process=":remote_api_2" + tools:ignore="ExportedService"> + <intent-filter> + <action android:name="org.openintents.openpgp.IOpenPgpService2" /> + </intent-filter> + </service> + <!-- Contact Sync services --> <service android:name=".service.DummyAccountService" |