From a1be4550146701181f66da4bb7177845cda8ae9e Mon Sep 17 00:00:00 2001 From: Manish Singh Date: Tue, 20 Dec 2022 22:28:16 +0000 Subject: [PATCH] Permission protect stageAllHealthConnectRemoteData The new APIs added in this topic's other CL are protected by knownSigner permission. The CTS test app can not be granted this permission. Granting these permissions to the Shell and the CTS test app can adopt the Shell's identity to get the necessary permissions and call these APIs. The test api is protected by the platform signature permission. Bug: 243145978 Test: atest CtsHealthConnectDeviceTestCases Change-Id: Ica89151b28213fd6fee69f5390f3d4e7f92bdc73 --- core/api/system-current.txt | 1 + core/api/test-current.txt | 1 + core/res/AndroidManifest.xml | 11 +++++++++++ core/res/res/values/config.xml | 6 ++++++ packages/Shell/AndroidManifest.xml | 4 ++++ 5 files changed, 23 insertions(+) diff --git a/core/api/system-current.txt b/core/api/system-current.txt index 4f50415dd6592..f79dbb9a993ac 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -325,6 +325,7 @@ package android { field public static final String SHUTDOWN = "android.permission.SHUTDOWN"; field public static final String SIGNAL_REBOOT_READINESS = "android.permission.SIGNAL_REBOOT_READINESS"; field public static final String SOUND_TRIGGER_RUN_IN_BATTERY_SAVER = "android.permission.SOUND_TRIGGER_RUN_IN_BATTERY_SAVER"; + field public static final String STAGE_HEALTH_CONNECT_REMOTE_DATA = "android.permission.STAGE_HEALTH_CONNECT_REMOTE_DATA"; field public static final String START_ACTIVITIES_FROM_BACKGROUND = "android.permission.START_ACTIVITIES_FROM_BACKGROUND"; field public static final String START_CROSS_PROFILE_ACTIVITIES = "android.permission.START_CROSS_PROFILE_ACTIVITIES"; field public static final String START_REVIEW_PERMISSION_DECISIONS = "android.permission.START_REVIEW_PERMISSION_DECISIONS"; diff --git a/core/api/test-current.txt b/core/api/test-current.txt index e3554a5aa043b..04cca7d085180 100644 --- a/core/api/test-current.txt +++ b/core/api/test-current.txt @@ -16,6 +16,7 @@ package android { field public static final String CONFIGURE_DISPLAY_BRIGHTNESS = "android.permission.CONFIGURE_DISPLAY_BRIGHTNESS"; field public static final String CONTROL_DEVICE_LIGHTS = "android.permission.CONTROL_DEVICE_LIGHTS"; field public static final String CONTROL_DEVICE_STATE = "android.permission.CONTROL_DEVICE_STATE"; + field public static final String DELETE_STAGED_HEALTH_CONNECT_REMOTE_DATA = "android.permission.DELETE_STAGED_HEALTH_CONNECT_REMOTE_DATA"; field public static final String FORCE_DEVICE_POLICY_MANAGER_LOGS = "android.permission.FORCE_DEVICE_POLICY_MANAGER_LOGS"; field public static final String FORCE_STOP_PACKAGES = "android.permission.FORCE_STOP_PACKAGES"; field public static final String GRANT_RUNTIME_PERMISSIONS = "android.permission.GRANT_RUNTIME_PERMISSIONS"; diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index 31ae0aa40252c..dc70c31cec2c5 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -6988,6 +6988,17 @@ + + + + + + @string/config_mainDisplayShape @string/config_secondaryDisplayShape + + + + diff --git a/packages/Shell/AndroidManifest.xml b/packages/Shell/AndroidManifest.xml index d56300e6781ab..31402dc366d18 100644 --- a/packages/Shell/AndroidManifest.xml +++ b/packages/Shell/AndroidManifest.xml @@ -790,6 +790,10 @@ + + + +