Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a3c16c43 authored by Jyoti Bhayana's avatar Jyoti Bhayana Committed by Android (Google) Code Review
Browse files

Merge "Adding flag for Headless system user camera access in manifest file" into main

parents 43cbd48c 57bbe119

core/api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -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";

core/res/AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -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"