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

Commit bb61adcc authored by Mark Punzalan's avatar Mark Punzalan Committed by Automerger Merge Worker
Browse files

Remove dependency on Identity in HotwordAudioStreamManager am: 53007b4d 

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



Change-Id: I7c2dae67231809902fd4e280ee2e85e52208475d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d96af089 53007b4d

services/voiceinteraction/java/com/android/server/voiceinteraction/HotwordAudioStreamManager.java

+16 −11
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ import static com.android.server.voiceinteraction.HotwordDetectionConnection.DEB 


import android.annotation.NonNull;

import android.app.AppOpsManager;

import android.media.permission.Identity;

import android.os.ParcelFileDescriptor;

import android.os.PersistableBundle;

import android.service.voice.HotwordAudioStream;
@@ -52,13 +51,18 @@ final class HotwordAudioStreamManager { 
    private static final int MAX_COPY_BUFFER_LENGTH_BYTES = 65_536;



    private final AppOpsManager mAppOpsManager;

    private final Identity mVoiceInteractorIdentity;

    private final int mVoiceInteractorUid;

    private final String mVoiceInteractorPackageName;

    private final String mVoiceInteractorAttributionTag;

    private final ExecutorService mExecutorService = Executors.newCachedThreadPool();



    HotwordAudioStreamManager(@NonNull AppOpsManager appOpsManager,

            @NonNull Identity voiceInteractorIdentity) {

            int voiceInteractorUid, @NonNull String voiceInteractorPackageName,

            @NonNull String voiceInteractorAttributionTag) {

        mAppOpsManager = appOpsManager;

        mVoiceInteractorIdentity = voiceInteractorIdentity;

        mVoiceInteractorUid = voiceInteractorUid;

        mVoiceInteractorPackageName = voiceInteractorPackageName;

        mVoiceInteractorAttributionTag = voiceInteractorAttributionTag;

    }



    /**
@@ -152,8 +156,8 @@ final class HotwordAudioStreamManager { 
            }



            if (mAppOpsManager.startOpNoThrow(AppOpsManager.OPSTR_RECORD_AUDIO_HOTWORD,

                    mVoiceInteractorIdentity.uid, mVoiceInteractorIdentity.packageName,

                    mVoiceInteractorIdentity.attributionTag, OP_MESSAGE) == MODE_ALLOWED) {

                    mVoiceInteractorUid, mVoiceInteractorPackageName,

                    mVoiceInteractorAttributionTag, OP_MESSAGE) == MODE_ALLOWED) {

                try {

                    // TODO(b/244599891): Set timeout, close after inactivity

                    mExecutorService.invokeAll(tasks);
@@ -162,14 +166,15 @@ final class HotwordAudioStreamManager { 
                    bestEffortPropagateError(e.getMessage());

                } finally {

                    mAppOpsManager.finishOp(AppOpsManager.OPSTR_RECORD_AUDIO_HOTWORD,

                            mVoiceInteractorIdentity.uid, mVoiceInteractorIdentity.packageName,

                            mVoiceInteractorIdentity.attributionTag);

                            mVoiceInteractorUid, mVoiceInteractorPackageName,

                            mVoiceInteractorAttributionTag);

                }

            } else {

                bestEffortPropagateError(

                        "Failed to obtain RECORD_AUDIO_HOTWORD permission for "

                                + SoundTriggerSessionPermissionsDecorator.toString(

                                mVoiceInteractorIdentity));

                        "Failed to obtain RECORD_AUDIO_HOTWORD permission for voice interactor with"

                                + " uid=" + mVoiceInteractorUid

                                + " packageName=" + mVoiceInteractorPackageName

                                + " attributionTag=" + mVoiceInteractorAttributionTag);

            }

        }

services/voiceinteraction/java/com/android/server/voiceinteraction/HotwordDetectionConnection.java

+2 −1
Original line number Diff line number Diff line
@@ -233,7 +233,8 @@ final class HotwordDetectionConnection { 
        mVoiceInteractorIdentity = voiceInteractorIdentity;

        mAppOpsManager = mContext.getSystemService(AppOpsManager.class);

        mHotwordAudioStreamManager = new HotwordAudioStreamManager(mAppOpsManager,

                mVoiceInteractorIdentity);

                mVoiceInteractorIdentity.uid, mVoiceInteractorIdentity.packageName,

                mVoiceInteractorIdentity.attributionTag);

        mDetectionComponentName = serviceName;

        mUser = userId;

        mCallback = callback;