diff options
author | Svet Ganov <svetoslavganov@google.com> | 2015-05-13 23:45:22 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-13 23:45:23 +0000 |
commit | 67b7ec28872dcb0ba09ef01bb87f7d558cbd19fc (patch) | |
tree | 1773bdd2e6e4951e5021fac86f4b10a89edbb632 /core/res | |
parent | 55e6ad78a0a30f917b6f0c135fdf328ebafc68fb (diff) | |
parent | f7e9cf4fb48ea80cbc5088204ac3f898109623f7 (diff) | |
download | frameworks_base-67b7ec28872dcb0ba09ef01bb87f7d558cbd19fc.zip frameworks_base-67b7ec28872dcb0ba09ef01bb87f7d558cbd19fc.tar.gz frameworks_base-67b7ec28872dcb0ba09ef01bb87f7d558cbd19fc.tar.bz2 |
Merge "Access mock location is no longer a runtime permission - framework" into mnc-dev
Diffstat (limited to 'core/res')
-rw-r--r-- | core/res/AndroidManifest.xml | 4 | ||||
-rw-r--r-- | core/res/res/values/strings.xml | 8 |
2 files changed, 1 insertions, 11 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index c59c1c9..edff537 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -836,9 +836,7 @@ <!-- 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" /> + android:protectionLevel="signature" /> <!-- ======================================= --> <!-- Permissions for accessing networks --> diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index f249c4a..1c0122d 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -946,14 +946,6 @@ <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. --> - <string name="permlab_accessMockLocation">mock location sources for testing</string> - <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. --> - <string name="permdesc_accessMockLocation">Create mock location sources for - testing or install a new location provider. This allows the app to - override the location and/or status returned by other location sources - such as GPS or location providers.</string> - - <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. --> <string name="permlab_accessLocationExtraCommands">access extra location provider commands</string> <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. --> <string name="permdesc_accessLocationExtraCommands">Allows the app to access |