commit c45c27bf8f4d3015ff560b773e708bb22c6cba7f
author Justin Lannin <jlannin@google.com> Wed Nov 20 20:52:35 2024 +0000
committer Justin Lannin <jlannin@google.com> Wed Nov 20 20:52:35 2024 +0000
tree 9046b746158401280b312257143a72803b9c811d
parent e83ada6df3be4dc4a2487db938ca149a41e7d952

Shell: Add health permissions for CTS tests.

BODY_SENSORS is being replaced with granular permissions
READ_HEART_RATE, READ_SKIN_TEMPERATURE, and READ_OXYGEN_SATURATION.
BODY_SENSORS was previously granted to shell, add the new permissions to shell as well.

BODY_SENSORS and the other health permissions are not added to privapp-permissions so not adding these there either.

Change-Id: I9a2bfbbfa1d0fda55cabab6978bb96fb9e1610a6
Flag: android.permission.flags.replace_body_sensor_permission_enabled
Test: atest ActivityManagerForegroundServiceTypeTest on Wear emulator
Bug: 379983910

packages/Shell/Android.bp

diff --git a/packages/Shell/Android.bp b/packages/Shell/Android.bp
index 3350efc..5f81085 100644
--- a/packages/Shell/Android.bp
+++ b/packages/Shell/Android.bp
@@ -27,6 +27,7 @@
     ],
     flags_packages: [
         "android.security.flags-aconfig",
+        "android.permission.flags-aconfig",
     ],
     platform_apis: true,
     certificate: "platform",
@@ -51,5 +52,6 @@
     manifest: "AndroidManifest.xml",
     flags_packages: [
         "android.security.flags-aconfig",
+        "android.permission.flags-aconfig",
     ],
 }

packages/Shell/AndroidManifest.xml

diff --git a/packages/Shell/AndroidManifest.xml b/packages/Shell/AndroidManifest.xml
index ac02af81..27e6bab 100644
--- a/packages/Shell/AndroidManifest.xml
+++ b/packages/Shell/AndroidManifest.xml
@@ -981,6 +981,14 @@
     <uses-permission android:name="android.permission.READ_SYSTEM_PREFERENCES" />
     <uses-permission android:name="android.permission.WRITE_SYSTEM_PREFERENCES" />
 
+    <!-- Permissions required for CTS test - ActivityManagerForegroundServiceTypeTest -->
+    <uses-permission android:name="android.permission.health.READ_HEART_RATE"
+        android:featureFlag="android.permission.flags.replace_body_sensor_permission_enabled"/>
+    <uses-permission android:name="android.permission.health.READ_OXYGEN_SATURATION"
+        android:featureFlag="android.permission.flags.replace_body_sensor_permission_enabled"/>
+    <uses-permission android:name="android.permission.health.READ_SKIN_TEMPERATURE"
+        android:featureFlag="android.permission.flags.replace_body_sensor_permission_enabled"/>
+
     <application
         android:label="@string/app_label"
         android:theme="@android:style/Theme.DeviceDefault.DayNight"