Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 65ef8fb4 authored by Haofan Wang's avatar Haofan Wang
Browse files

Fix media quality implementation 

In convert bundle to parameter array util function, the toArray()
method's return type is the most general type: Object. it's attempting a
direct cast, which will result in a ClassCastException at runtime.

Bug: 394345093
Test: atest and check log message
Flag: EXEMPT bugfix
Change-Id: I6c8f86bf82f7b6cc284aae650b3c2672bea5a854
parent ea55a5ff

services/core/java/com/android/server/media/quality/MediaQualityUtils.java

+2 −2
Original line number Diff line number Diff line
@@ -679,7 +679,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]);

    }



    /**
@@ -865,7 +865,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) {