diff options
| author | Svetoslav <svetoslavganov@google.com> | 2015-04-16 20:19:44 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-16 20:19:46 +0000 |
| commit | 8fcd5fee60b468c36aee337da0cadad3cd8cf4cd (patch) | |
| tree | 373d83a46aa32a7d8f98c7856963b117e095e23e | |
| parent | 33d930ad96a1983b70f33ceefa3b8990713f3bbe (diff) | |
| parent | 7f24225e5e363613eb4f5027d07c32a9acf457f3 (diff) | |
| download | frameworks_base-8fcd5fee60b468c36aee337da0cadad3cd8cf4cd.zip frameworks_base-8fcd5fee60b468c36aee337da0cadad3cd8cf4cd.tar.gz frameworks_base-8fcd5fee60b468c36aee337da0cadad3cd8cf4cd.tar.bz2 | |
Merge "Lower protection level of access mock location permission"
| -rw-r--r-- | core/res/AndroidManifest.xml | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index 5465212..ec57eba 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 --> <!-- ======================================= --> |