summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2020-05-28 20:18:28 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2020-05-28 20:18:28 +0000
commitfa0e5dfdb27d212afb8677a41e9fcbc261aa9479 (patch)
treef3eb24d44e12fa3a6a685435e2d793c3de4b47f7
parente91dba13dad099d603eac0f2df409dedaf2769d8 (diff)
parent7568afb1865c57ad91ee69f615620fc8eda75dc9 (diff)
Merge "Add LOCATION_HARDWARE permission to shell." into rvc-dev am: 8a6ef8e52d am: fc7c4138ef am: b16116ce55 am: 7568afb186
Change-Id: I9bd3884b6c76f276f5d139c6dc73dabedbdfe8dd
-rw-r--r--data/etc/privapp-permissions-platform.xml2
-rw-r--r--packages/Shell/AndroidManifest.xml3
2 files changed, 5 insertions, 0 deletions
diff --git a/data/etc/privapp-permissions-platform.xml b/data/etc/privapp-permissions-platform.xml
index 16851cf95435..04fead8d4b32 100644
--- a/data/etc/privapp-permissions-platform.xml
+++ b/data/etc/privapp-permissions-platform.xml
@@ -411,6 +411,8 @@ applications that come with the platform
<permission name="android.permission.TUNER_RESOURCE_ACCESS" />
<!-- Permissions required for CTS test - TVInputManagerTest -->
<permission name="android.permission.TV_INPUT_HARDWARE" />
+ <!-- Permission required for CTS test - PrivilegedLocationPermissionTest -->
+ <permission name="android.permission.LOCATION_HARDWARE" />
</privapp-permissions>
<privapp-permissions package="com.android.statementservice">
diff --git a/packages/Shell/AndroidManifest.xml b/packages/Shell/AndroidManifest.xml
index a0130f8e9b83..ae8e8e82241d 100644
--- a/packages/Shell/AndroidManifest.xml
+++ b/packages/Shell/AndroidManifest.xml
@@ -303,6 +303,9 @@
<!-- Permissions required for CTS test - TVInputManagerTest -->
<uses-permission android:name="android.permission.TV_INPUT_HARDWARE" />
+ <!-- Permission needed for CTS test - PrivilegedLocationPermissionTest -->
+ <uses-permission android:name="android.permission.LOCATION_HARDWARE" />
+
<application android:label="@string/app_label"
android:theme="@android:style/Theme.DeviceDefault.DayNight"
android:defaultToDeviceProtectedStorage="true"