commit a1422149cbf8d8022c9b413613eb562c00e85eb5
author Shunkai Yao <yaoshunkai@google.com> Wed Oct 23 21:00:18 2024 +0000
committer Shunkai Yao <yaoshunkai@google.com> Thu Oct 31 01:44:41 2024 +0000
tree 22066c554ab3dce011d150217281cfa01f74b9d5
parent b1071dc678849cb9608909590165db5dc160d728

Use getParameter return value for the preset length

as per documented by AudioEffect.getParameter return value

Flag: EXEMPT bugfix
Bug: 372771511
Test: atest CtsSecurityTestCases:android.security.cts.EffectBundleTest
Change-Id: Ia14d57a7a8818f1b9c4a2884bb8da120658d8441
Merged-In: Ia14d57a7a8818f1b9c4a2884bb8da120658d8441

media/java/android/media/audiofx/Equalizer.java

diff --git a/media/java/android/media/audiofx/Equalizer.java b/media/java/android/media/audiofx/Equalizer.java
index 7abada0..0986345 100644
--- a/media/java/android/media/audiofx/Equalizer.java
+++ b/media/java/android/media/audiofx/Equalizer.java
@@ -153,9 +153,8 @@
             param[0] = PARAM_GET_PRESET_NAME;
             for (int i = 0; i < mNumPresets; i++) {
                 param[1] = i;
-                checkStatus(getParameter(param, value));
-                int length = 0;
-                while (value[length] != 0) length++;
+                final int length = getParameter(param, value);
+                checkStatus(length);
                 try {
                     mPresetNames[i] = new String(value, 0, length, "ISO-8859-1");
                 } catch (java.io.UnsupportedEncodingException e) {