Fix failed PermissionPolicyTest
Fixes: 265301333
Test: atest android.permission2.cts.PermissionPolicyTest
Change-Id: I4cf42ca695975809d4ebf68993cf3bbd0f6f5f06
diff --git a/service/AndroidManifest.xml b/service/AndroidManifest.xml
index 95f3667..9eee4cd 100644
--- a/service/AndroidManifest.xml
+++ b/service/AndroidManifest.xml
@@ -1021,19 +1021,19 @@
and manage the power of those zones.
<p>Protection level: signature|privileged
-->
- <permission android:name="android.car.permission.MONITOR_OCCUPANT_ZONE"
+ <permission android:name="android.car.permission.MANAGE_REMOTE_DEVICE"
android:protectionLevel="signature|privileged"
- android:label="@string/car_permission_label_monitor_occupant_zone"
- android:description="@string/car_permission_desc_monitor_occupant_zone"/>
+ android:label="@string/car_permission_label_manage_remote_device"
+ android:description="@string/car_permission_desc_manage_remote_device"/>
<!-- Allows an application to establish connection and communicate to peer apps (apps that have
the same package name as the caller) installed in other occupant zones in the car.
<p>Protection level: signature|privileged
-->
- <permission android:name="android.car.permission.CONNECT_OCCUPANT_ZONE"
+ <permission android:name="android.car.permission.MANAGE_OCCUPANT_CONNECTION"
android:protectionLevel="signature|privileged"
- android:label="@string/car_permission_label_connect_occupant_zone"
- android:description="@string/car_permission_desc_connect_occupant_zone"/>
+ android:label="@string/car_permission_label_manage_occupant_connection"
+ android:description="@string/car_permission_desc_manage_occupant_connection"/>
<!-- NOTE: when you're adding a new permission, you should edit
cts/tests/tests/permission2/res/raw/automotive_android_manifest.xml accordingly and run
diff --git a/service/res/values/strings.xml b/service/res/values/strings.xml
index 9479218..becbfbd 100644
--- a/service/res/values/strings.xml
+++ b/service/res/values/strings.xml
@@ -607,29 +607,29 @@
apps (apps that have the same package name as the caller) installed in those zones,
and manage the power of those zones.
[CHAR LIMIT=NONE] -->
- <string name="car_permission_label_monitor_occupant_zone">monitor the states of other occupant
+ <string name="car_permission_label_manage_remote_device">monitor the states of other occupant
zones in the car and peer apps (apps that have the same package name as the caller)
installed in those zones, and manage the power of those zones.</string>
<!-- Permission text: monitor the states of other occupant zones in the car and peer apps (apps
that have the same package name as the caller) installed in those zones, and manage the
power of those zones.
[CHAR LIMIT=NONE] -->
- <string name="car_permission_desc_monitor_occupant_zone">Monitor the states of other occupant
+ <string name="car_permission_desc_manage_remote_device">Monitor the states of other occupant
zones in the car and peer apps (apps that have the same package name as the caller)
installed in those zones, and manage the power of those zones.</string>
<!-- Permission text: apps can establish connection and communicate to peer apps (apps that
have the same package name as the caller)installed in other occupant zones in the car.
[CHAR LIMIT=NONE] -->
- <string name="car_permission_label_connect_occupant_zone">establish connection and communicate
- to peer apps (apps that have the same package name as the caller) installed in other
- occupant zones in the car</string>
+ <string name="car_permission_label_manage_occupant_connection">establish connection and
+ communicate to peer apps (apps that have the same package name as the caller) installed in
+ other occupant zones in the car</string>
<!-- Permission text: apps can establish connection and communicate to peer apps (apps that
have the same package name as the caller)installed in other occupant zones in the car.
[CHAR LIMIT=NONE] -->
- <string name="car_permission_desc_connect_occupant_zone">Establish connection and communicate
- to peer apps (apps that have the same package name as the caller) installed in other
- occupant zones in the car.</string>
+ <string name="car_permission_desc_manage_occupant_connection">Establish connection and
+ communicate to peer apps (apps that have the same package name as the caller) installed in
+ other occupant zones in the car.</string>
<!-- Notification messages -->
<!-- Notification text: Notification shown to the user when vehicle CAN bus fails -->
