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

Commit 20798bfa authored by Andy Hung's avatar Andy Hung Committed by Automerger Merge Worker
Browse files

Merge "MediaMetrics: Track AudioTrack and AudioRecord callers" into rvc-dev... 

Merge "MediaMetrics: Track AudioTrack and AudioRecord callers" into rvc-dev am: c576f56c am: 286ccbc1 am: 2177732b

Change-Id: I8ebc89dc21bc3c6fa951f700e1d3f7a5dd6096af
parents 54903eb3 2177732b

core/jni/android_media_AudioRecord.cpp

+3 −0
Original line number Diff line number Diff line
@@ -307,6 +307,9 @@ android_media_AudioRecord_setup(JNIEnv *env, jobject thiz, jobject weak_this, 
                    status);

            goto native_init_failure;

        }

        // Set caller name so it can be logged in destructor.

        // MediaMetricsConstants.h: AMEDIAMETRICS_PROP_CALLERNAME_VALUE_JAVA

        lpRecorder->setCallerName("java");

    } else { // end if nativeRecordInJavaObj == 0)

        lpRecorder = (AudioRecord*)nativeRecordInJavaObj;

        // TODO: We need to find out which members of the Java AudioRecord might need to be

core/jni/android_media_AudioTrack.cpp

+3 −0
Original line number Diff line number Diff line
@@ -425,6 +425,9 @@ static jint android_media_AudioTrack_setup(JNIEnv *env, jobject thiz, jobject we 
            ALOGE("Error %d initializing AudioTrack", status);

            goto native_init_failure;

        }

        // Set caller name so it can be logged in destructor.

        // MediaMetricsConstants.h: AMEDIAMETRICS_PROP_CALLERNAME_VALUE_JAVA

        lpTrack->setCallerName("java");

    } else {  // end if (nativeAudioTrack == 0)

        lpTrack = (AudioTrack*)nativeAudioTrack;

        // TODO: We need to find out which members of the Java AudioTrack might

media/jni/soundpool/Stream.cpp

+3 −1
Original line number Diff line number Diff line
@@ -330,7 +330,9 @@ void Stream::play_l(const std::shared_ptr<Sound>& sound, int32_t nextStreamID, 
                    AudioTrack::TRANSFER_DEFAULT,

                    nullptr /*offloadInfo*/, -1 /*uid*/, -1 /*pid*/,

                    mStreamManager->getAttributes());



            // Set caller name so it can be logged in destructor.

            // MediaMetricsConstants.h: AMEDIAMETRICS_PROP_CALLERNAME_VALUE_SOUNDPOOL

            newTrack->setCallerName("soundpool");

            oldTrack = mAudioTrack;

            status = newTrack->initCheck();

            if (status != NO_ERROR) {