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

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

Merge "Audio: Support FCC_LIMIT for 22.2 testing" into sc-dev am: aadafc7b 

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

Change-Id: I1d62b83345eff4f838c3503132a2d87a1730215d
parents bf424a02 aadafc7b

core/jni/android_media_AudioSystem.cpp

+1 −1
Original line number Diff line number Diff line
@@ -2383,7 +2383,7 @@ android_media_AudioSystem_setSurroundFormatEnabled(JNIEnv *env, jobject thiz, 
}



static jint android_media_AudioSystem_getMaxChannelCount(JNIEnv *env, jobject thiz) {

    return FCC_8;

    return FCC_LIMIT;

}



static jint android_media_AudioSystem_getMaxSampleRate(JNIEnv *env, jobject thiz) {

media/jni/soundpool/Sound.cpp

+1 −1
Original line number Diff line number Diff line
@@ -214,7 +214,7 @@ status_t Sound::doLoad() 
        } else if (sampleRate > kMaxSampleRate) {

            ALOGE("%s: sample rate (%u) out of range", __func__, sampleRate);

            status = BAD_VALUE;

        } else if (channelCount < 1 || channelCount > FCC_8) {

        } else if (channelCount < 1 || channelCount > FCC_LIMIT) {

            ALOGE("%s: sample channel count (%d) out of range", __func__, channelCount);

            status = BAD_VALUE;

        } else {