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

Commit ac96491a authored by Atneya Nair's avatar Atneya Nair Committed by Automerger Merge Worker
Browse files

Merge "Prevent ST clients from auto-attach to fake HAL" into udc-dev am: 9a80b65e am: 4f663d81 

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



Change-Id: I569bb126fd601adeaf8790d7e10e995c7552549d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 16c2d3c0 4f663d81

core/java/android/hardware/soundtrigger/SoundTrigger.java

+5 −0
Original line number Diff line number Diff line
@@ -76,6 +76,11 @@ public class SoundTrigger { 
    private SoundTrigger() {

    }



    /**

     * @hide

     */

    public static final String FAKE_HAL_ARCH = "injection";



    /**

     * Status code used when the operation succeeded

     */

core/java/android/service/voice/AlwaysOnHotwordDetector.java

+7 −5
Original line number Diff line number Diff line
@@ -843,11 +843,13 @@ public class AlwaysOnHotwordDetector extends AbstractDetector { 
            Identity identity = new Identity();

            identity.packageName = ActivityThread.currentOpPackageName();

            if (moduleProperties == null) {

                List<SoundTrigger.ModuleProperties> modulePropList =

                        mModelManagementService.listModuleProperties(identity);

                if (modulePropList.size() > 0) {

                    moduleProperties = modulePropList.get(0);

                }

                moduleProperties = mModelManagementService

                        .listModuleProperties(identity)

                        .stream()

                        .filter(prop -> !prop.getSupportedModelArch()

                                .equals(SoundTrigger.FAKE_HAL_ARCH))

                        .findFirst()

                        .orElse(null);

                // (@atneya) intentionally let a null moduleProperties through until

                // all CTS tests are fixed

            }

media/java/android/media/soundtrigger/SoundTriggerManager.java

+9 −4
Original line number Diff line number Diff line
@@ -94,12 +94,17 @@ public final class SoundTriggerManager { 
            originatorIdentity.packageName = ActivityThread.currentOpPackageName();



            try (SafeCloseable ignored = ClearCallingIdentityContext.create()) {

                List<ModuleProperties> modulePropertiesList = soundTriggerService

                        .listModuleProperties(originatorIdentity);

                if (!modulePropertiesList.isEmpty()) {

                ModuleProperties moduleProperties = soundTriggerService

                        .listModuleProperties(originatorIdentity)

                        .stream()

                        .filter(prop -> !prop.getSupportedModelArch()

                                .equals(SoundTrigger.FAKE_HAL_ARCH))

                        .findFirst()

                        .orElse(null);

                if (moduleProperties != null) {

                    mSoundTriggerSession = soundTriggerService.attachAsOriginator(

                                                originatorIdentity,

                                                modulePropertiesList.get(0),

                                                moduleProperties,

                                                mBinderToken);

                } else {

                    mSoundTriggerSession = null;