From 2c07217281f93b6d6abfa1183ac080099b3b855c Mon Sep 17 00:00:00 2001 From: Nagesh Pachorkar Date: Wed, 29 Mar 2023 19:40:40 +0000 Subject: [PATCH] Hide "Introduced granular skin temperature permissions" Hiding submission 20678628-Granular_Body_Sensor_Permissions_In_U Reason for hiding: According to the WHS product decision, this permission is no more required. Bug: 274938077 Test: Presubmit CTS Hiding API changes: /q/submissionid:20678628-Granular_Body_Sensor_Permissions_In_U Change-Id: I46fbdc7a877f9666d8b27e58f672ae8eeda12d35 --- core/api/current.txt | 5 +---- core/api/test-current.txt | 2 ++ core/java/android/app/AppOpsManager.java | 5 ++++- core/java/android/content/pm/ServiceInfo.java | 2 -- core/res/AndroidManifest.xml | 9 ++++++--- 5 files changed, 13 insertions(+), 10 deletions(-) diff --git a/core/api/current.txt b/core/api/current.txt index 45c9becdcfd41..76f17218f1bcc 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -64,8 +64,6 @@ package android { field public static final String BLUETOOTH_SCAN = "android.permission.BLUETOOTH_SCAN"; field public static final String BODY_SENSORS = "android.permission.BODY_SENSORS"; field public static final String BODY_SENSORS_BACKGROUND = "android.permission.BODY_SENSORS_BACKGROUND"; - field public static final String BODY_SENSORS_WRIST_TEMPERATURE = "android.permission.BODY_SENSORS_WRIST_TEMPERATURE"; - field public static final String BODY_SENSORS_WRIST_TEMPERATURE_BACKGROUND = "android.permission.BODY_SENSORS_WRIST_TEMPERATURE_BACKGROUND"; field public static final String BROADCAST_PACKAGE_REMOVED = "android.permission.BROADCAST_PACKAGE_REMOVED"; field public static final String BROADCAST_SMS = "android.permission.BROADCAST_SMS"; field public static final String BROADCAST_STICKY = "android.permission.BROADCAST_STICKY"; @@ -5024,7 +5022,6 @@ package android.app { field public static final String OPSTR_ADD_VOICEMAIL = "android:add_voicemail"; field public static final String OPSTR_ANSWER_PHONE_CALLS = "android:answer_phone_calls"; field public static final String OPSTR_BODY_SENSORS = "android:body_sensors"; - field public static final String OPSTR_BODY_SENSORS_WRIST_TEMPERATURE = "android:body_sensors_wrist_temperature"; field public static final String OPSTR_CALL_PHONE = "android:call_phone"; field public static final String OPSTR_CAMERA = "android:camera"; field public static final String OPSTR_COARSE_LOCATION = "android:coarse_location"; @@ -13029,7 +13026,7 @@ package android.content.pm { field @RequiresPermission(allOf={android.Manifest.permission.FOREGROUND_SERVICE_CAMERA}, anyOf={android.Manifest.permission.CAMERA}, conditional=true) public static final int FOREGROUND_SERVICE_TYPE_CAMERA = 64; // 0x40 field @RequiresPermission(allOf={android.Manifest.permission.FOREGROUND_SERVICE_CONNECTED_DEVICE}, anyOf={android.Manifest.permission.BLUETOOTH_ADVERTISE, android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_SCAN, android.Manifest.permission.CHANGE_NETWORK_STATE, android.Manifest.permission.CHANGE_WIFI_STATE, android.Manifest.permission.CHANGE_WIFI_MULTICAST_STATE, android.Manifest.permission.NFC, android.Manifest.permission.TRANSMIT_IR, android.Manifest.permission.UWB_RANGING}, conditional=true) public static final int FOREGROUND_SERVICE_TYPE_CONNECTED_DEVICE = 16; // 0x10 field @RequiresPermission(value=android.Manifest.permission.FOREGROUND_SERVICE_DATA_SYNC, conditional=true) public static final int FOREGROUND_SERVICE_TYPE_DATA_SYNC = 1; // 0x1 - field @RequiresPermission(allOf={android.Manifest.permission.FOREGROUND_SERVICE_HEALTH}, anyOf={android.Manifest.permission.ACTIVITY_RECOGNITION, android.Manifest.permission.BODY_SENSORS, android.Manifest.permission.BODY_SENSORS_WRIST_TEMPERATURE, android.Manifest.permission.HIGH_SAMPLING_RATE_SENSORS}) public static final int FOREGROUND_SERVICE_TYPE_HEALTH = 256; // 0x100 + field @RequiresPermission(allOf={android.Manifest.permission.FOREGROUND_SERVICE_HEALTH}, anyOf={android.Manifest.permission.ACTIVITY_RECOGNITION, android.Manifest.permission.BODY_SENSORS, android.Manifest.permission.HIGH_SAMPLING_RATE_SENSORS}) public static final int FOREGROUND_SERVICE_TYPE_HEALTH = 256; // 0x100 field @RequiresPermission(allOf={android.Manifest.permission.FOREGROUND_SERVICE_LOCATION}, anyOf={android.Manifest.permission.ACCESS_COARSE_LOCATION, android.Manifest.permission.ACCESS_FINE_LOCATION}, conditional=true) public static final int FOREGROUND_SERVICE_TYPE_LOCATION = 8; // 0x8 field public static final int FOREGROUND_SERVICE_TYPE_MANIFEST = -1; // 0xffffffff field @RequiresPermission(value=android.Manifest.permission.FOREGROUND_SERVICE_MEDIA_PLAYBACK, conditional=true) public static final int FOREGROUND_SERVICE_TYPE_MEDIA_PLAYBACK = 2; // 0x2 diff --git a/core/api/test-current.txt b/core/api/test-current.txt index ed36f1c3d99d2..cf09955893874 100644 --- a/core/api/test-current.txt +++ b/core/api/test-current.txt @@ -8,6 +8,8 @@ package android { field public static final String APPROVE_INCIDENT_REPORTS = "android.permission.APPROVE_INCIDENT_REPORTS"; field public static final String BACKGROUND_CAMERA = "android.permission.BACKGROUND_CAMERA"; field public static final String BIND_CELL_BROADCAST_SERVICE = "android.permission.BIND_CELL_BROADCAST_SERVICE"; + field public static final String BODY_SENSORS_WRIST_TEMPERATURE = "android.permission.BODY_SENSORS_WRIST_TEMPERATURE"; + field public static final String BODY_SENSORS_WRIST_TEMPERATURE_BACKGROUND = "android.permission.BODY_SENSORS_WRIST_TEMPERATURE_BACKGROUND"; field public static final String BRIGHTNESS_SLIDER_USAGE = "android.permission.BRIGHTNESS_SLIDER_USAGE"; field public static final String BROADCAST_CLOSE_SYSTEM_DIALOGS = "android.permission.BROADCAST_CLOSE_SYSTEM_DIALOGS"; field public static final String CHANGE_APP_IDLE_STATE = "android.permission.CHANGE_APP_IDLE_STATE"; diff --git a/core/java/android/app/AppOpsManager.java b/core/java/android/app/AppOpsManager.java index 265b56418d4b9..b48a8fb738320 100644 --- a/core/java/android/app/AppOpsManager.java +++ b/core/java/android/app/AppOpsManager.java @@ -2188,7 +2188,10 @@ public class AppOpsManager { public static final String OPSTR_CAPTURE_CONSENTLESS_BUGREPORT_ON_USERDEBUG_BUILD = "android:capture_consentless_bugreport_on_userdebug_build"; - /** Access to wrist temperature body sensors. */ + /** + * Access to wrist temperature body sensors. + * @hide + */ public static final String OPSTR_BODY_SENSORS_WRIST_TEMPERATURE = "android:body_sensors_wrist_temperature"; diff --git a/core/java/android/content/pm/ServiceInfo.java b/core/java/android/content/pm/ServiceInfo.java index 1a3c3d97634c4..7e0954a555602 100644 --- a/core/java/android/content/pm/ServiceInfo.java +++ b/core/java/android/content/pm/ServiceInfo.java @@ -332,7 +332,6 @@ public class ServiceInfo extends ComponentInfo * permissions: * {@link android.Manifest.permission#ACTIVITY_RECOGNITION}, * {@link android.Manifest.permission#BODY_SENSORS}, - * {@link android.Manifest.permission#BODY_SENSORS_WRIST_TEMPERATURE}, * {@link android.Manifest.permission#HIGH_SAMPLING_RATE_SENSORS}. */ @RequiresPermission( @@ -342,7 +341,6 @@ public class ServiceInfo extends ComponentInfo anyOf = { Manifest.permission.ACTIVITY_RECOGNITION, Manifest.permission.BODY_SENSORS, - Manifest.permission.BODY_SENSORS_WRIST_TEMPERATURE, Manifest.permission.HIGH_SAMPLING_RATE_SENSORS, } ) diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index 81b1f21e286dd..78d39236b3924 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -1746,9 +1746,11 @@ android:protectionLevel="dangerous" android:permissionFlags="hardRestricted" /> - +

Protection level: dangerous + @hide + --> -