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

Commit 58ae2782 authored by Glenn Kasten's avatar Glenn Kasten Committed by Android (Google) Code Review
Browse files

Merge "Use audio_session_t consistently" into nyc-dev

parents 8b1918e5 33b84044

core/java/android/speech/tts/AudioPlaybackQueueItem.java

+2 −2
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
package android.speech.tts;



import android.content.Context;

import android.media.AudioSystem;

import android.media.AudioManager;

import android.media.MediaPlayer;

import android.net.Uri;

import android.os.ConditionVariable;
@@ -57,7 +57,7 @@ class AudioPlaybackQueueItem extends PlaybackQueueItem { 
        int sessionId = mAudioParams.mSessionId;

        mPlayer = MediaPlayer.create(

                mContext, mUri, null, mAudioParams.mAudioAttributes,

                sessionId > 0 ? sessionId : AudioSystem.AUDIO_SESSION_ALLOCATE);

                sessionId > 0 ? sessionId : AudioManager.AUDIO_SESSION_ID_GENERATE);

        if (mPlayer == null) {

            dispatcher.dispatchOnError(TextToSpeech.ERROR_OUTPUT);

            return;

core/java/android/speech/tts/TextToSpeechService.java

+4 −4
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ import android.annotation.NonNull; 
import android.app.Service;

import android.content.Intent;

import android.media.AudioAttributes;

import android.media.AudioSystem;

import android.media.AudioManager;

import android.net.Uri;

import android.os.Binder;

import android.os.Bundle;
@@ -659,7 +659,7 @@ public abstract class TextToSpeechService extends Service { 
        /**

         * Audio session identifier. May be used to associate audio playback with one of the

         * {@link android.media.audiofx.AudioEffect} objects. If not specified by client,

         * it should be equal to {@link AudioSystem#AUDIO_SESSION_ALLOCATE}.

         * it should be equal to {@link AudioManager#AUDIO_SESSION_ID_GENERATE}.

         */

        public final int mSessionId;
@@ -684,7 +684,7 @@ public abstract class TextToSpeechService extends Service { 


        /** Create AudioOutputParams with default values */

        AudioOutputParams() {

            mSessionId = AudioSystem.AUDIO_SESSION_ALLOCATE;

            mSessionId = AudioManager.AUDIO_SESSION_ID_GENERATE;

            mVolume = Engine.DEFAULT_VOLUME;

            mPan = Engine.DEFAULT_PAN;

            mAudioAttributes = null;
@@ -722,7 +722,7 @@ public abstract class TextToSpeechService extends Service { 
            return new AudioOutputParams(

                    paramsBundle.getInt(

                            Engine.KEY_PARAM_SESSION_ID,

                            AudioSystem.AUDIO_SESSION_ALLOCATE),

                            AudioManager.AUDIO_SESSION_ID_GENERATE),

                    paramsBundle.getFloat(

                            Engine.KEY_PARAM_VOLUME,

                            Engine.DEFAULT_VOLUME),

core/jni/android_media_AudioRecord.cpp

+2 −2
Original line number Diff line number Diff line
@@ -200,7 +200,7 @@ android_media_AudioRecord_setup(JNIEnv *env, jobject thiz, jobject weak_this, 
        ALOGE("Error creating AudioRecord: Error retrieving session id pointer");

        return (jint) AUDIO_JAVA_ERROR;

    }

    int sessionId = nSession[0];

    audio_session_t sessionId = (audio_session_t) nSession[0];

    env->ReleasePrimitiveArrayCritical(jSession, nSession, 0);

    nSession = NULL;
@@ -385,7 +385,7 @@ android_media_AudioRecord_start(JNIEnv *env, jobject thiz, jint event, jint trig 
    }



    return nativeToJavaStatus(

            lpRecorder->start((AudioSystem::sync_event_t)event, triggerSession));

            lpRecorder->start((AudioSystem::sync_event_t)event, (audio_session_t) triggerSession));

}

core/jni/android_media_AudioSystem.cpp

+2 −2
Original line number Diff line number Diff line
@@ -389,7 +389,7 @@ android_media_AudioSystem_dyn_policy_callback(int event, String8 regId, int val) 
}



static void

android_media_AudioSystem_recording_callback(int event, int session, int source,

android_media_AudioSystem_recording_callback(int event, audio_session_t session, int source,

        const audio_config_base_t *clientConfig, const audio_config_base_t *deviceConfig,

        audio_patch_handle_t patchHandle)

{

core/jni/android_media_AudioTrack.cpp

+1 −1
Original line number Diff line number Diff line
@@ -235,7 +235,7 @@ android_media_AudioTrack_setup(JNIEnv *env, jobject thiz, jobject weak_this, job 
        ALOGE("Error creating AudioTrack: Error retrieving session id pointer");

        return (jint) AUDIO_JAVA_ERROR;

    }

    int sessionId = nSession[0];

    audio_session_t sessionId = (audio_session_t) nSession[0];

    env->ReleasePrimitiveArrayCritical(jSession, nSession, 0);

    nSession = NULL;