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

Commit b3bdbae6 authored by Songyue Han's avatar Songyue Han Committed by Automerger Merge Worker
Browse files

Merge "CodecCapabilities: Fix validFeatures()." into main am: bbd3882c am: c7ba97f2 

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



Change-Id: Id07f09000e1a0e9a8b23ac5d0e67265f68c96f49
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d096f4ce c7ba97f2

media/java/android/media/MediaCodecInfo.java

+4 −4
Original line number Diff line number Diff line
@@ -908,13 +908,13 @@ public final class MediaCodecInfo { 
        /** @hide */

        public String[] validFeatures() {

            Feature[] features = getValidFeatures();

            String[] res = new String[features.length];

            for (int i = 0; i < res.length; i++) {

            ArrayList<String> res = new ArrayList();

            for (int i = 0; i < features.length; i++) {

                if (!features[i].mInternal) {

                    res[i] = features[i].mName;

                    res.add(features[i].mName);

                }

            }

            return res;

            return res.toArray(new String[0]);

        }



        private Feature[] getValidFeatures() {