Merge "Add missing CAR_TEST_SERVICE permission to car service" into qt-qpr1-dev
diff --git a/service/AndroidManifest.xml b/service/AndroidManifest.xml
index ebea889..e2db410 100644
--- a/service/AndroidManifest.xml
+++ b/service/AndroidManifest.xml
@@ -475,6 +475,16 @@
android:label="@string/car_permission_label_enroll_trust"
android:description="@string/car_permission_desc_enroll_trust" />
+ <!-- Allows a test application to control car service's testing mode.
+ This is only for platform level testing.
+ <p>Protection level: signature|privileged
+ -->
+ <permission
+ android:name="android.car.permission.CAR_TEST_SERVICE"
+ android:protectionLevel="signature|privileged"
+ android:label="@string/car_permission_label_car_test_service"
+ android:description="@string/car_permission_desc_car_test_service" />
+
<uses-permission android:name="android.permission.CALL_PHONE" />
<uses-permission android:name="android.permission.DEVICE_POWER" />
<uses-permission android:name="android.permission.GRANT_RUNTIME_PERMISSIONS" />
diff --git a/service/res/values/strings.xml b/service/res/values/strings.xml
index ef731b8..11dd845 100644
--- a/service/res/values/strings.xml
+++ b/service/res/values/strings.xml
@@ -256,6 +256,11 @@
<string name="car_permission_label_enroll_trust">Enroll Trusted Device</string>
<string name="car_permission_desc_enroll_trust">Allow Trusted Device Enrollment</string>
+ <!-- Permission text: Control car service's test mode [CHAR LIMIT=NONE] -->
+ <string name="car_permission_label_car_test_service">Control car service\u2019s test mode</string>
+ <!-- Permission text: Control car service's test mode [CHAR LIMIT=NONE] -->
+ <string name="car_permission_desc_car_test_service">Control car service\u2019s test mode</string>
+
<!-- The default name of device enrolled as trust device [CHAR LIMIT=NONE] -->
<string name="trust_device_default_name">My Device</string>