diff options
| author | 2023-10-10 04:31:36 +0000 | |
|---|---|---|
| committer | 2023-10-10 20:39:38 +0000 | |
| commit | 73fee8f90fe553a73b8c1e06e89e526bf9605301 (patch) | |
| tree | 745a59ceddc25ddf073ae7f659ff5c9f131bd25b | |
| parent | 36819def9691b1712dfa436676c6c5a4f8dd0cde (diff) | |
Add @SystemApi to the voice activation permission to expose it to system apps.
Bug: 287084170
Test: presubmit
Change-Id: I4c8afa81d2eb1505b8e64ec06e930fd1bb25f4b0
| -rw-r--r-- | core/api/system-current.txt | 1 | ||||
| -rw-r--r-- | core/res/AndroidManifest.xml | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/core/api/system-current.txt b/core/api/system-current.txt index a99eeb0c36d8..49ff8c4316c8 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -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"; diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index a0b8cca58d9b..b0ecc60de597 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -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" /> |