diff options
| author | cyBerta <cyberta@riseup.net> | 2018-06-14 21:12:20 +0200 |
|---|---|---|
| committer | cyBerta <cyberta@riseup.net> | 2018-06-14 21:12:20 +0200 |
| commit | 452b42326167b97081bc386dbb8fd800075d1269 (patch) | |
| tree | ca14573e065748fe6a2aad5a096c2d713e0c6e39 /app/src/main/AndroidManifest.xml | |
| parent | dc4e74975afcba8a694ec23666c538dc761277b1 (diff) | |
| parent | 117ec679f83e67762552e2c16310a1f57a9b9d88 (diff) | |
Merge branch 'mirror_0xacab_master' into #8889_revise_NavigationDrawer
fix merge conflict in NavigationDrawerFragment
Diffstat (limited to 'app/src/main/AndroidManifest.xml')
| -rw-r--r-- | app/src/main/AndroidManifest.xml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 6f6feebb..4e1a9406 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -26,6 +26,7 @@ <uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" /> + <uses-permission android:name="android.permission.WAKE_LOCK" /> <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" android:maxSdkVersion="18"/> @@ -102,7 +103,8 @@ <service android:name=".eip.EIP" - android:exported="false"> + android:exported="false" + android:permission="android.permission.BIND_JOB_SERVICE"> <intent-filter> <action android:name="se.leap.bitmaskclient.EIP.UPDATE"/> <action android:name="se.leap.bitmaskclient.EIP.START"/> |