diff options
| author | Parménides GV <parmegv@sdf.org> | 2014-03-26 12:15:09 +0100 |
|---|---|---|
| committer | Parménides GV <parmegv@sdf.org> | 2014-03-26 12:15:09 +0100 |
| commit | c946bed3e63d9d271cd08d4c33e564a157908c36 (patch) | |
| tree | e5869abb9eb941e340a7968b34225c7a58199161 /AndroidManifest.xml | |
| parent | 0323676ef98b12af3c7ce20bf4101bdc900ef654 (diff) | |
| parent | 8a754e30011bf60ac9bff2cf987c3fa263b3d924 (diff) | |
Merge branch 'develop' into release-0.5
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index d549ad6a..89af1568 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -22,9 +22,13 @@ <uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> - <!-- if you want to run the unit test for Dashboard you will need that you uncomment the following line --> - <!-- <uses-permission android:name="android.permission.WRITE_SETTINGS" /> --> - + + <!-- if you want to run test, this permissions are needed. Gradle will get rid of them once we implement it. --> + <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" /> + <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE"/> + <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS"/> + <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" /> + <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" /> <!-- <uses-permission android:name="com.android.vending.BILLING" /> --> |