projects / platform / upstream / iotivity.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 1618d80)
Added Android permissions into example apps.
authorTim Kourt <tim.a.kourt@intel.com>
Mon, 3 Aug 2015 21:51:10 +0000 (14:51 -0700)
committerErich Keane <erich.keane@intel.com>
Mon, 3 Aug 2015 23:03:23 +0000 (23:03 +0000)
Signed-off-by: Tim Kourt <tim.a.kourt@intel.com>
Change-Id: I0921237844b9b29853fbd46643ffe17b1fe3438b
Reviewed-on: https://gerrit.iotivity.org/gerrit/2089
Reviewed-by: Erich Keane <erich.keane@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
android/examples/fridgeclient/src/main/AndroidManifest.xml patch | blob | history
android/examples/fridgeserver/src/main/AndroidManifest.xml patch | blob | history
android/examples/guiclient/src/main/AndroidManifest.xml patch | blob | history
android/examples/simpleclient/src/main/AndroidManifest.xml patch | blob | history
android/examples/simpleserver/src/main/AndroidManifest.xml patch | blob | history

diff --git a/android/examples/fridgeclient/src/main/AndroidManifest.xml b/android/examples/fridgeclient/src/main/AndroidManifest.xml
index a8e40a4..fba408a 100644 (file)
--- a/android/examples/fridgeclient/src/main/AndroidManifest.xml
+++ b/android/examples/fridgeclient/src/main/AndroidManifest.xml
@@ -4,6 +4,17 @@
     package="org.iotivity.base.examples.fridgeclient" >
     <uses-sdk tools:overrideLibrary="org.iotivity.base"></uses-sdk>
 
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.BLUETOOTH"/>
+    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN"/>
+    <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
+    <uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE"/>
+    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE"/>
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>
+
     <application
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher"
diff --git a/android/examples/fridgeserver/src/main/AndroidManifest.xml b/android/examples/fridgeserver/src/main/AndroidManifest.xml
index fddfc88..5fb6cc2 100644 (file)
--- a/android/examples/fridgeserver/src/main/AndroidManifest.xml
+++ b/android/examples/fridgeserver/src/main/AndroidManifest.xml
@@ -5,6 +5,17 @@
 
     <uses-sdk tools:overrideLibrary="org.iotivity.base"></uses-sdk>
 
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.BLUETOOTH"/>
+    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN"/>
+    <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
+    <uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE"/>
+    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE"/>
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>
+
     <application
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher"
diff --git a/android/examples/guiclient/src/main/AndroidManifest.xml b/android/examples/guiclient/src/main/AndroidManifest.xml
index b0c8055..60e7486 100644 (file)
--- a/android/examples/guiclient/src/main/AndroidManifest.xml
+++ b/android/examples/guiclient/src/main/AndroidManifest.xml
@@ -3,9 +3,19 @@
     package="org.iotivity.guiclient"
     xmlns:tools="http://schemas.android.com/tools">
 
-    <uses-permission android:name="android.permission.INTERNET" />
     <uses-sdk tools:overrideLibrary="org.iotivity.base"></uses-sdk>
 
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.BLUETOOTH"/>
+    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN"/>
+    <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
+    <uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE"/>
+    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE"/>
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>
+
     <application
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher"
diff --git a/android/examples/simpleclient/src/main/AndroidManifest.xml b/android/examples/simpleclient/src/main/AndroidManifest.xml
index fa9a5e0..655870c 100644 (file)
--- a/android/examples/simpleclient/src/main/AndroidManifest.xml
+++ b/android/examples/simpleclient/src/main/AndroidManifest.xml
@@ -6,6 +6,14 @@
     <uses-sdk tools:overrideLibrary="org.iotivity.base"></uses-sdk>
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.BLUETOOTH"/>
+    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN"/>
+    <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
+    <uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE"/>
+    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE"/>
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>
 
     <application
         android:allowBackup="true"
diff --git a/android/examples/simpleserver/src/main/AndroidManifest.xml b/android/examples/simpleserver/src/main/AndroidManifest.xml
index d1ba814..64451e5 100644 (file)
--- a/android/examples/simpleserver/src/main/AndroidManifest.xml
+++ b/android/examples/simpleserver/src/main/AndroidManifest.xml
@@ -6,6 +6,14 @@
     <uses-sdk tools:overrideLibrary="org.iotivity.base"></uses-sdk>
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.BLUETOOTH"/>
+    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN"/>
+    <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
+    <uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE"/>
+    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE"/>
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>
 
     <application
         android:allowBackup="true"
Domain: Network & Connectivity / IoT Connectivity;