summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorxinhe <xinhe@google.com>2014-09-03 05:46:44 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-09-03 05:46:44 +0000
commitdb60e09a73fe534b94bb1bdd8e6421049e95dab5 (patch)
tree012b2cb06ccc4d5790a60aa1df7284d47cc7a001
parent092244b60b3dfeea1ca17633e2561b68184273cf (diff)
parentf4f667b7a96fe615a62025a48e9d135481e1411d (diff)
downloadOMA-DM-db60e09a73fe534b94bb1bdd8e6421049e95dab5.tar.gz
Merge "Remove MOUNT_UNMOUNT_FILESYSTEMS from User permission" into lmp-dev
-rw-r--r--DMService/AndroidManifest.xml1
-rw-r--r--plugins/CONNMO/AndroidManifest.xml1
2 files changed, 0 insertions, 2 deletions
diff --git a/DMService/AndroidManifest.xml b/DMService/AndroidManifest.xml
index 5bb09c4..d4e888a 100644
--- a/DMService/AndroidManifest.xml
+++ b/DMService/AndroidManifest.xml
@@ -40,7 +40,6 @@
<!-- FIXME: remove these permissions if not required. -->
<uses-permission android:name="android.permission.DISABLE_KEYGUARD"/>
- <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"/>
<uses-permission android:name="com.android.permission.CONNMO_SETTINGS"/>
<uses-permission android:name="com.android.permission.INJECT_OMADM_SETTINGS"/>
diff --git a/plugins/CONNMO/AndroidManifest.xml b/plugins/CONNMO/AndroidManifest.xml
index 6236f9d..84e41bf 100644
--- a/plugins/CONNMO/AndroidManifest.xml
+++ b/plugins/CONNMO/AndroidManifest.xml
@@ -13,7 +13,6 @@
<uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS" />
<uses-permission android:name="android.permission.WRITE_SETTINGS" />
<uses-permission android:name="android.permission.CHANGE_CONFIGURATION" />
- <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />
<uses-permission android:name="android.permission.MODIFY_PHONE_STATE" />
<uses-permission android:name="android.permission.CALL_PHONE" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />