diff options
author | lalottacontinua <loddatio@posteo.de> | 2018-06-18 21:15:15 +0200 |
---|---|---|
committer | lalottacontinua <loddatio@posteo.de> | 2018-06-18 21:15:15 +0200 |
commit | 1a34cc1e3ebf152505ed591787a7778744020bbd (patch) | |
tree | 4dc3054b63ef53b32ba0591aca8c317b8cd2cd8d /app/src/main/AndroidManifest.xml | |
parent | 2fbf5a2cadabb503306af4a59c1f98596784e488 (diff) | |
parent | 77879cf10f7857b95c968446f5ce9e0437bceb0f (diff) |
solved merge conflict
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 25300c8d..84fb83f8 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"/> @@ -106,7 +107,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"/> |