cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/mgeier63/open-keychain into mgeier63-master

Browse Source
This commit is contained in:
Dominik Schürmann
2015-08-28 17:08:10 +02:00
parent 765ec094c9 298e42d3aa
commit 2569984601
4 changed files with 207 additions and 271 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
OpenKeychain/src/main/AndroidManifest.xml
View File

@@ -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"