From a2f79b0d0f2373179998dd226bc5a86ad31f4e7e Mon Sep 17 00:00:00 2001
From: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Date: Fri, 21 Feb 2014 14:21:58 +0100
Subject: [PATCH] Android: Make default permissions less confusing

Add comments to explain the magic placeholders for default
permissions and features, and move the INTERNET and
WRITE_EXTERNAL_STORAGE permissions from the manifest so that
we use the same mechanism for all default permissions.

Change-Id: Ia62dd4314c1c10eb201b5203772ffe88b1ce7a04
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
---
 src/android/java/AndroidManifest.xml | 9 +++++++--
 src/corelib/corelib.pro              | 3 +++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/android/java/AndroidManifest.xml b/src/android/java/AndroidManifest.xml
index 3a2a52b874..3209ab58ac 100644
--- a/src/android/java/AndroidManifest.xml
+++ b/src/android/java/AndroidManifest.xml
@@ -39,8 +39,13 @@
     </application>
     <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="14"/>
     <supports-screens android:largeScreens="true" android:normalScreens="true" android:anyDensity="true" android:smallScreens="true"/>
+
+    <!-- The following comment will be replaced upon deployment with default permissions based on the dependencies of the application.
+         Remove the comment if you do not require these default permissions. -->
     <!-- %%INSERT_PERMISSIONS -->
-    <uses-permission android:name="android.permission.INTERNET"/>
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+
+    <!-- The following comment will be replaced upon deployment with default features based on the dependencies of the application.
+         Remove the comment if you do not require these default features. -->
     <!-- %%INSERT_FEATURES -->
+
 </manifest>
diff --git a/src/corelib/corelib.pro b/src/corelib/corelib.pro
index 373b3f148d..79c90e0664 100644
--- a/src/corelib/corelib.pro
+++ b/src/corelib/corelib.pro
@@ -24,6 +24,9 @@ ANDROID_LIB_DEPENDENCIES = \
 ANDROID_BUNDLED_JAR_DEPENDENCIES = \
     jar/QtAndroid-bundled.jar \
     jar/QtAndroidAccessibility-bundled.jar
+ANDROID_PERMISSIONS = \
+    android.permission.INTERNET \
+    android.permission.WRITE_EXTERNAL_STORAGE
 
 load(qt_module)