diff options
| author | 2024-04-04 00:45:26 +0000 | |
|---|---|---|
| committer | 2024-04-04 00:45:26 +0000 | |
| commit | 15ff7fea04bffc548b02c67141e6ad8c06c0849d (patch) | |
| tree | 4d48c497e78a7c7aca648e0dd1ce25f729eb7985 | |
| parent | 0e116eddb74422ed0aca3ace593ba0ae46d6f1bc (diff) | |
| parent | bf2bd1cec219bfed7a8d7991927d3bd73a474574 (diff) | |
Merge "Revert permission RECEIVE_SANDBOXED_DETECTION_TRAINING_DATA since it is not going in V." into main
| -rw-r--r-- | core/res/AndroidManifest.xml | 10 | ||||
| -rw-r--r-- | packages/Shell/AndroidManifest.xml | 1 |
2 files changed, 0 insertions, 11 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index d4256ca316c2..f74329903690 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -7507,16 +7507,6 @@ <permission android:name="android.permission.RECEIVE_SANDBOX_TRIGGER_AUDIO" android:protectionLevel="signature|privileged|appop" /> - <!-- @SystemApi Required for the privileged assistant apps targeting - {@link android.os.Build.VERSION_CODES#VANILLA_ICE_CREAM} - that receive training data from a sandboxed {@link HotwordDetectionService} or - {@link VisualQueryDetectionService}. - <p>Protection level: internal|appop - @FlaggedApi("android.permission.flags.voice_activation_permission_apis") - @hide --> - <permission android:name="android.permission.RECEIVE_SANDBOXED_DETECTION_TRAINING_DATA" - android:protectionLevel="internal|appop" /> - <!-- @SystemApi Allows requesting the framework broadcast the {@link Intent#ACTION_DEVICE_CUSTOMIZATION_READY} intent. @hide --> diff --git a/packages/Shell/AndroidManifest.xml b/packages/Shell/AndroidManifest.xml index 58040716db3e..b94e224850aa 100644 --- a/packages/Shell/AndroidManifest.xml +++ b/packages/Shell/AndroidManifest.xml @@ -896,7 +896,6 @@ <!-- Permissions required for CTS test - CtsVoiceInteractionTestCases --> <uses-permission android:name="android.permission.RESET_HOTWORD_TRAINING_DATA_EGRESS_COUNT" /> - <uses-permission android:name="android.permission.RECEIVE_SANDBOXED_DETECTION_TRAINING_DATA" /> <uses-permission android:name="android.permission.RECEIVE_SANDBOX_TRIGGER_AUDIO" /> <uses-permission android:name="android.permission.GET_BINDING_UID_IMPORTANCE" /> |