commit e21f57c323b350511e8f6c9ca7f0df1e74612f32
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Thu Oct 31 16:07:41 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Oct 31 16:07:41 2024 +0000
tree c05cabb876a3c9b89b7796485f9aff9acfa9d02a
parent 240ae0adcdce36237c21fe3f7a38c85159487ca1
parent 2e758c400ea8801893f8ac5c300f1ee43b3c45ee

Merge "Use getParameter return value for the preset length" into main am: 2e758c400e

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

Change-Id: I3cd68763f64b668fba4e3cec81373cc6008b4bdc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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) {