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

Commit 4023f97e authored by Nate Myren's avatar Nate Myren Committed by Automerger Merge Worker
Browse files

Merge "TEMP: note "RECORD_AUDIO_HOTWORD" in SoundTriggerMiddleware" into sc-dev am: c05d205e 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14346401

Change-Id: I68048e83ccf9db2aacd087bd56e7fed555e577ba
parents fe7d1e58 c05d205e

services/core/java/com/android/server/soundtrigger_middleware/SoundTriggerMiddlewarePermission.java

+7 −1
Original line number Original line Diff line number Diff line
@@ -21,6 +21,7 @@ import static android.Manifest.permission.RECORD_AUDIO; 




import android.annotation.NonNull;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.Nullable;

import android.app.AppOpsManager;

import android.content.Context;

import android.content.Context;

import android.content.PermissionChecker;

import android.content.PermissionChecker;

import android.media.permission.Identity;

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.

     * Throws a {@link SecurityException} iff the originator has permission to receive data.

     */

     */

    void enforcePermissionsForDataDelivery(@NonNull Identity identity, @NonNull String reason) {

    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,

        enforcePermissionForDataDelivery(mContext, identity, CAPTURE_AUDIO_HOTWORD,

                reason);

                reason);

    }

    }