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

Commit db6bc47d authored by Shunkai Yao's avatar Shunkai Yao Committed by Automerger Merge Worker
Browse files

Merge "replace the hardcode for min/max sample rate with audio.h in jni" into... 

Merge "replace the hardcode for min/max sample rate with audio.h in jni" into main am: e47fbe40 am: 02ea9015

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



Change-Id: I9808f789713bb2dde3343bc11a8bfebd6701878c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f4f88f9c 02ea9015

core/jni/android_media_AudioSystem.cpp

+2 −3
Original line number Diff line number Diff line
@@ -2718,12 +2718,11 @@ static jint android_media_AudioSystem_getMaxChannelCount(JNIEnv *env, jobject th 
}



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

    // see frameworks/av/services/audiopolicy/common/include/policy.h

    return 192000; // SAMPLE_RATE_HZ_MAX (for API)

    return SAMPLE_RATE_HZ_MAX;

}



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

    return 4000; // SAMPLE_RATE_HZ_MIN  (for API)

    return SAMPLE_RATE_HZ_MIN;

}



static std::vector<uid_t> convertJIntArrayToUidVector(JNIEnv *env, jintArray jArray) {