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

Commit 7e948df6 authored by Faye Yan's avatar Faye Yan Committed by Android (Google) Code Review
Browse files

Merge "Add @SystemApi to the voice activation permission to expose it to system apps." into main

parents 60887155 73fee8f9

core/api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -297,6 +297,7 @@ package android { 
    field public static final String RECEIVE_DATA_ACTIVITY_CHANGE = "android.permission.RECEIVE_DATA_ACTIVITY_CHANGE";

    field public static final String RECEIVE_DEVICE_CUSTOMIZATION_READY = "android.permission.RECEIVE_DEVICE_CUSTOMIZATION_READY";

    field public static final String RECEIVE_EMERGENCY_BROADCAST = "android.permission.RECEIVE_EMERGENCY_BROADCAST";

    field @FlaggedApi("android.permission.flags.voice_activation_permission_apis") public static final String RECEIVE_SANDBOX_TRIGGER_AUDIO = "android.permission.RECEIVE_SANDBOX_TRIGGER_AUDIO";

    field public static final String RECEIVE_WIFI_CREDENTIAL_CHANGE = "android.permission.RECEIVE_WIFI_CREDENTIAL_CHANGE";

    field public static final String RECORD_BACKGROUND_AUDIO = "android.permission.RECORD_BACKGROUND_AUDIO";

    field public static final String RECOVERY = "android.permission.RECOVERY";

core/res/AndroidManifest.xml

+3 −1
Original line number Diff line number Diff line
@@ -7233,9 +7233,11 @@ 
                android:description="@string/permdesc_fullScreenIntent"

                android:protectionLevel="normal|appop" />



    <!-- Required for the assistant apps targeting {@link android.os.Build.VERSION_CODES#V}

    <!-- @SystemApi Required for the privileged assistant apps targeting

         {@link android.os.Build.VERSION_CODES#VANILLA_ICE_CREAM}

         that receive voice trigger from the trusted hotword detection service.

         <p>Protection level: signature|privileged|appop

         @FlaggedApi("android.permission.flags.voice_activation_permission_apis")

         @hide -->

    <permission android:name="android.permission.RECEIVE_SANDBOX_TRIGGER_AUDIO"

                android:protectionLevel="signature|privileged|appop" />