diff options
| author | 2024-01-05 21:40:20 +0000 | |
|---|---|---|
| committer | 2024-01-05 21:40:20 +0000 | |
| commit | a3c16c437932cbb5872f883940c556a9f424f61a (patch) | |
| tree | bd1eca89a846df6edc7fe7506ad7a2670ee0e3bb | |
| parent | 43cbd48cf00dc296b82b74e56bffbe1b7e1471ac (diff) | |
| parent | 57bbe119a394a0cf455e3ee064e4678faaf15714 (diff) | |
Merge "Adding flag for Headless system user camera access in manifest file" into main
| -rw-r--r-- | core/api/system-current.txt | 2 | ||||
| -rw-r--r-- | core/res/AndroidManifest.xml | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/core/api/system-current.txt b/core/api/system-current.txt index 0d4169fb9121..494d48899c80 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -95,7 +95,7 @@ package android { field public static final String BYPASS_ROLE_QUALIFICATION = "android.permission.BYPASS_ROLE_QUALIFICATION"; field public static final String CALL_AUDIO_INTERCEPTION = "android.permission.CALL_AUDIO_INTERCEPTION"; field public static final String CAMERA_DISABLE_TRANSMIT_LED = "android.permission.CAMERA_DISABLE_TRANSMIT_LED"; - field public static final String CAMERA_HEADLESS_SYSTEM_USER = "android.permission.CAMERA_HEADLESS_SYSTEM_USER"; + field @FlaggedApi("com.android.internal.camera.flags.camera_hsum_permission") public static final String CAMERA_HEADLESS_SYSTEM_USER = "android.permission.CAMERA_HEADLESS_SYSTEM_USER"; field public static final String CAMERA_OPEN_CLOSE_LISTENER = "android.permission.CAMERA_OPEN_CLOSE_LISTENER"; field public static final String CAPTURE_AUDIO_HOTWORD = "android.permission.CAPTURE_AUDIO_HOTWORD"; field public static final String CAPTURE_CONSENTLESS_BUGREPORT_ON_USERDEBUG_BUILD = "android.permission.CAPTURE_CONSENTLESS_BUGREPORT_ON_USERDEBUG_BUILD"; diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index e65bfab06052..1eeffb9e2875 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -1709,6 +1709,7 @@ <!-- @SystemApi Allows camera access by Headless System User 0 when device is running in HSUM Mode. + @FlaggedApi("com.android.internal.camera.flags.camera_hsum_permission") @hide --> <permission android:name="android.permission.CAMERA_HEADLESS_SYSTEM_USER" android:permissionGroup="android.permission-group.UNDEFINED" |