summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Shunkai Yao <yaoshunkai@google.com> 2024-07-10 20:13:59 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2024-07-10 20:13:59 +0000
commite47fbe4089f778a5c09a5aa19b1102dd900cec37 (patch)
tree62098c78da2fe5d1b7b949514fcf92773c7ba675
parent30028ce0463cb10028deec7bcaf53d7e550d4073 (diff)
parentb90e8e3579eb859faab8794da67e5b93885b1e61 (diff)
Merge "replace the hardcode for min/max sample rate with audio.h in jni" into main
-rw-r--r--core/jni/android_media_AudioSystem.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/core/jni/android_media_AudioSystem.cpp b/core/jni/android_media_AudioSystem.cpp
index 52237989f059..9fecbd344908 100644
--- a/core/jni/android_media_AudioSystem.cpp
+++ b/core/jni/android_media_AudioSystem.cpp
@@ -2703,12 +2703,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) {