diff options
| author | 2024-07-10 20:32:05 +0000 | |
|---|---|---|
| committer | 2024-07-10 20:32:05 +0000 | |
| commit | 02ea9015976f09895751cb2301fa3b92e4658b8e (patch) | |
| tree | e74f086d156313ff58ceb129e1a6ac390d38841c | |
| parent | 143eb1ff95f8019d36b95d39824c853a3a57a18f (diff) | |
| parent | e47fbe4089f778a5c09a5aa19b1102dd900cec37 (diff) | |
Merge "replace the hardcode for min/max sample rate with audio.h in jni" into main am: e47fbe4089
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3163376
Change-Id: I5c630bb44fd595b7077e4c65835d8c28bbebb842
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | core/jni/android_media_AudioSystem.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/core/jni/android_media_AudioSystem.cpp b/core/jni/android_media_AudioSystem.cpp index eaff7608ce3b..c07fd3838837 100644 --- a/core/jni/android_media_AudioSystem.cpp +++ b/core/jni/android_media_AudioSystem.cpp @@ -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) { |