diff options
| author | Parménides GV <parmegv@sdf.org> | 2014-03-19 17:12:47 +0100 |
|---|---|---|
| committer | Parménides GV <parmegv@sdf.org> | 2014-03-19 17:12:47 +0100 |
| commit | 47ee09203766694fbdb91fd0c0d56268ecd39448 (patch) | |
| tree | f436ac392d3fa4e06c257cc00e8a07cff6d0c3da /AndroidManifest.xml | |
| parent | f5ffd8628d3c6caf48b4515771628a89faac696e (diff) | |
| parent | c1c7d1f7106afa4e2300f37355642c56641884e9 (diff) | |
Merge branch 'feature/simulate-no-network-without-airplane-mode' into develop_test
Conflicts:
AndroidManifest.xml
tests/src/se/leap/bitmaskclient/test/testDashboard.java
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 815ddf87..6738a90c 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" /> --> |