Merge "Fix media quality implementation" into main

1 files changed, 2 insertions, 2 deletions

diff --git a/services/core/java/com/android/server/media/quality/MediaQualityUtils.java b/services/core/java/com/android/server/media/quality/MediaQualityUtils.java
index ba61e508bef6..03780413f8a1 100644
--- a/services/core/java/com/android/server/media/quality/MediaQualityUtils.java
+++ b/services/core/java/com/android/server/media/quality/MediaQualityUtils.java
@@ -682,7 +682,7 @@ public final class MediaQualityUtils {
             pictureParams.add(PictureParameter.pictureQualityEventType(
                     (byte) params.getInt(PictureQuality.PARAMETER_PICTURE_QUALITY_EVENT_TYPE)));
         }
-        return  (PictureParameter[]) pictureParams.toArray();
+        return pictureParams.toArray(new PictureParameter[0]);
     }
 
     /**
@@ -871,7 +871,7 @@ public final class MediaQualityUtils {
         dts.height = params.getBoolean(SoundQuality.PARAMETER_DTS_VIRTUAL_X_HEIGHT);
         soundParams.add(SoundParameter.dtsVirtualX(dts));
 
-        return  (SoundParameter[]) soundParams.toArray();
+        return soundParams.toArray(new SoundParameter[0]);
     }
 
     private static String persistableBundleToJson(PersistableBundle bundle) {