Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

TEMP: note "RECORD_AUDIO_HOTWORD" in SoundTriggerMiddleware

Browse Source 
note the RECORD_AUDIO_HOTWORD op, rather than the RECORD_AUDIO. In
addition, check the RECORD_AUDIO permission for preflight, not data
delivery

Bug: 186164881
Test: Manual
Change-Id: I3275647d0f9a6e3ce8b97a556f56723b49170c8e
This commit is contained in:
Nate Myren
2021-04-28 21:17:05 -07:00
parent c72ac760e1
commit c6c38cd6f0
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/soundtrigger_middleware/SoundTriggerMiddlewarePermission.java
View File

@@ -21,6 +21,7 @@ import static android.Manifest.permission.RECORD_AUDIO;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.app.AppOpsManager;
import android.content.Context;
import android.content.PermissionChecker;
import android.media.permission.Identity;
@@ -132,7 +133,12 @@ public class SoundTriggerMiddlewarePermission implements ISoundTriggerMiddleware
* Throws a {@link SecurityException} iff the originator has permission to receive data.
*/
void enforcePermissionsForDataDelivery(@NonNull Identity identity, @NonNull String reason) {
enforcePermissionForDataDelivery(mContext, identity, RECORD_AUDIO, reason);
// START TEMP HACK
enforcePermissionForPreflight(mContext, identity, RECORD_AUDIO);
int hotwordOp = AppOpsManager.strOpToOp(AppOpsManager.OPSTR_RECORD_AUDIO_HOTWORD);
mContext.getSystemService(AppOpsManager.class).noteOpNoThrow(hotwordOp, identity.uid,
identity.packageName, identity.attributionTag, reason);
// END TEMP HACK
enforcePermissionForDataDelivery(mContext, identity, CAPTURE_AUDIO_HOTWORD,
reason);
}