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

Commit 2bd14977 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add test API for phone call state" into udc-dev am: 5cef355a am:... 

Merge "Add test API for phone call state" into udc-dev am: 5cef355a am: 268e1c69 am: 7b3a6f1c am: df86a9f4

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



Change-Id: Ib6e96c8d9fcf320b97af8783901b9131adea511f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c5bb6dab df86a9f4

core/api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -2038,6 +2038,7 @@ package android.media.metrics { 
package android.media.soundtrigger {



  public final class SoundTriggerInstrumentation {

    method public void setInPhoneCallState(boolean);

    method public void setResourceContention(boolean);

    method public void triggerOnResourcesAvailable();

    method public void triggerRestart();

core/java/com/android/internal/app/ISoundTriggerService.aidl

+6 −0
Original line number Diff line number Diff line
@@ -79,4 +79,10 @@ interface ISoundTriggerService { 
     * Attach an HAL injection interface.

     */

     void attachInjection(ISoundTriggerInjection injection);



    /**

     * Test API to override the phone call state.

     */

     void setInPhoneCallState(boolean isInPhoneCall);



}

media/java/android/media/soundtrigger/SoundTriggerInstrumentation.java

+22 −0
Original line number Diff line number Diff line
@@ -66,6 +66,8 @@ public final class SoundTriggerInstrumentation { 
    @GuardedBy("mLock")

    private IBinder mClientToken = null;



    private final ISoundTriggerService mService;



    private final GlobalCallback mClientCallback;

    private final Executor mGlobalCallbackExecutor;
@@ -562,6 +564,7 @@ public final class SoundTriggerInstrumentation { 
            @NonNull GlobalCallback callback) {

        mClientCallback = Objects.requireNonNull(callback);

        mGlobalCallbackExecutor = Objects.requireNonNull(executor);

        mService = service;

        try {

            service.attachInjection(new Injection());

        } catch (RemoteException e) {
@@ -651,5 +654,24 @@ public final class SoundTriggerInstrumentation { 
            }

        }

    }



    /**

     * Simulate a phone call for {@link com.android.server.soundtrigger.SoundTriggerService}.

     * If the phone call state changes, the service will be notified to respond.

     * The service should pause recognition for the duration of the call.

     *

     * @param isInPhoneCall - {@code true} to cause the SoundTriggerService to

     * see the phone call state as off-hook. {@code false} to cause the service to

     * see the state as normal.

     * @hide

     */

    @TestApi

    public void setInPhoneCallState(boolean isInPhoneCall) {

        try {

            mService.setInPhoneCallState(isInPhoneCall);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

    }

}

services/voiceinteraction/java/com/android/server/soundtrigger/SoundTriggerService.java

+6 −0
Original line number Diff line number Diff line
@@ -412,6 +412,12 @@ public class SoundTriggerService extends SystemService { 
            }

        }



        @Override

        public void setInPhoneCallState(boolean isInPhoneCall) {

            Slog.i(TAG, "Overriding phone call state: " + isInPhoneCall);

            mDeviceStateHandler.onPhoneCallStateChanged(isInPhoneCall);

        }



        @Override

        public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {

            // Event loggers