diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-08-29 13:29:51 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-08-29 13:29:51 +0200 |
| commit | e037b7824856cea0bf090a394cb70eb92c38c5a4 (patch) | |
| tree | 51bc41cedf83148c6080ae613c59589969fca55b /OpenKeychain/src/main/AndroidManifest.xml | |
| parent | a6e25e6448ab162b351288ee0c241512e05c3611 (diff) | |
| parent | 3c25dc2b0c20d0bc24a60478779a007489faa5e3 (diff) | |
| download | open-keychain-e037b7824856cea0bf090a394cb70eb92c38c5a4.tar.gz open-keychain-e037b7824856cea0bf090a394cb70eb92c38c5a4.tar.bz2 open-keychain-e037b7824856cea0bf090a394cb70eb92c38c5a4.zip | |
Merge remote-tracking branch 'origin/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 00c861ccc..77d238239 100644 --- a/OpenKeychain/src/main/AndroidManifest.xml +++ b/OpenKeychain/src/main/AndroidManifest.xml @@ -764,8 +764,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" @@ -777,6 +778,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" |