From 7f24225e5e363613eb4f5027d07c32a9acf457f3 Mon Sep 17 00:00:00 2001
From: Svetoslav <svetoslavganov@google.com>
Date: Tue, 14 Apr 2015 14:44:11 -0700
Subject: Lower protection level of access mock location permission

The ACCESS_MOCK_LOCATION permission is gated by a secure setting
toggled in developer options by the user. Hence, there is no need
for getting yet another consent from the user for accessing it.

Change-Id: Ica1a72f587a712d7da7c00cfc4a8ca228064286e
---
 core/res/AndroidManifest.xml | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

(limited to 'core/res/AndroidManifest.xml')

diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index 3d22e52..100bae7 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -517,13 +517,6 @@
         android:description="@string/permdesc_accessCoarseLocation"
         android:protectionLevel="dangerous" />
 
-    <!-- Allows an application to create mock location providers for testing. -->
-    <permission android:name="android.permission.ACCESS_MOCK_LOCATION"
-        android:permissionGroup="android.permission-group.LOCATION"
-        android:label="@string/permlab_accessMockLocation"
-        android:description="@string/permdesc_accessMockLocation"
-        android:protectionLevel="dangerous" />
-
     <!-- ====================================================================== -->
     <!-- Permissions for accessing the device telephony                         -->
     <!-- ====================================================================== -->
@@ -734,12 +727,6 @@
     <!-- =============================================================== -->
     <eat-comment />
 
-
-    <!-- =============================================================== -->
-    <!-- Permissions for accessing the user dictionary                   -->
-    <!-- =============================================================== -->
-    <eat-comment />
-
     <!-- Used for permissions that provide access to the user
          calendar to create / view events.-->
     <permission-group android:name="android.permission-group.USER_DICTIONARY"
@@ -848,6 +835,12 @@
         android:protectionLevel="signature|system" />
     <uses-permission android:name="android.permission.LOCATION_HARDWARE"/>
 
+    <!-- Allows an application to create mock location providers for testing. -->
+    <permission android:name="android.permission.ACCESS_MOCK_LOCATION"
+        android:label="@string/permlab_accessMockLocation"
+        android:description="@string/permdesc_accessMockLocation"
+        android:protectionLevel="normal" />
+
     <!-- ======================================= -->
     <!-- Permissions for accessing networks -->
     <!-- ======================================= -->
-- 
cgit v1.1