From 9f3ea489c6e4006a4c5c43548335df9f2132fccb Mon Sep 17 00:00:00 2001 From: Joanne Chung Date: Mon, 20 Jun 2022 08:15:28 +0000 Subject: [PATCH] RESTRICT AUTOMERGE Disable the Trusted Hotword requirement This is a manual cherry pick for the missing part in the change c5e8f7f59d775c42fe53cb99fcbafc5ec005f579. Change-Id: I70addcd47a45e61812def21035c2868c0b910d54 Fix: 234026976 Test: manual - dsp and non-dsp; true and false positives; mute mic sensor - events aren't delivered and no dialog is shown, hotword still works after unmuting; mute mic and restart, unmute after starting reco; Trusted and non-Trusted hotwording Test: atest CameraMicIndicatorsPermissionTest Test: atest HotwordDetectionServiceBasicTest Test: atest android.cts.statsdatom.appops.AppOpsTests#testAppOps Merged-In: I68f2f37b5ce835e7fd8649b382eaee9fc299ec79 --- .../server/pm/permission/LegacyPermissionManagerService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/core/java/com/android/server/pm/permission/LegacyPermissionManagerService.java b/services/core/java/com/android/server/pm/permission/LegacyPermissionManagerService.java index 88b4a94f70270..03e568c4599e9 100644 --- a/services/core/java/com/android/server/pm/permission/LegacyPermissionManagerService.java +++ b/services/core/java/com/android/server/pm/permission/LegacyPermissionManagerService.java @@ -413,8 +413,8 @@ public class LegacyPermissionManagerService extends ILegacyPermissionManager.Stu return result; } mContext.getSystemService(AppOpsManager.class).noteOpNoThrow( - AppOpsManager.OP_RECEIVE_AMBIENT_TRIGGER_AUDIO, uid, packageName, - attributionTag, reason); + AppOpsManager.OP_RECORD_AUDIO_HOTWORD, uid, packageName, attributionTag, + reason); return result; } }