From 6594cb8a073a8cd452e9133957aa76a4975b7b04 Mon Sep 17 00:00:00 2001
From: hkuang <hkuang@google.com>
Date: Tue, 19 Jan 2021 19:19:12 -0800
Subject: [PATCH] transcoding: Fix a bug in ApplicationMediaCapabilites.

The creater have not parsed the unsupported codec/hdr types.

Bug: 176993974
Test: atest  CtsMediaTranscodingTestCases:ApplicationMediaCapabilitiesTest
Change-Id: Id6a692ae468948ea5672e22f0b3af0b6e50ecfad
---
 .../android/media/ApplicationMediaCapabilities.java | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/apex/media/framework/java/android/media/ApplicationMediaCapabilities.java b/apex/media/framework/java/android/media/ApplicationMediaCapabilities.java
index 25ccec2930f1d..13c4953715d38 100644
--- a/apex/media/framework/java/android/media/ApplicationMediaCapabilities.java
+++ b/apex/media/framework/java/android/media/ApplicationMediaCapabilities.java
@@ -192,12 +192,25 @@ public final class ApplicationMediaCapabilities implements Parcelable {
                     for (int readCount = 0; readCount < count; ++readCount) {
                         builder.addSupportedVideoMimeType(in.readString());
                     }
+
+                    // Parse unsupported video codec mime types.
+                    count = in.readInt();
+                    for (int readCount = 0; readCount < count; ++readCount) {
+                        builder.addUnsupportedVideoMimeType(in.readString());
+                    }
+
                     // Parse supported hdr types.
                     count = in.readInt();
                     for (int readCount = 0; readCount < count; ++readCount) {
                         builder.addSupportedHdrType(in.readString());
                     }
 
+                    // Parse unsupported hdr types.
+                    count = in.readInt();
+                    for (int readCount = 0; readCount < count; ++readCount) {
+                        builder.addUnsupportedHdrType(in.readString());
+                    }
+
                     boolean supported = in.readBoolean();
                     builder.setSlowMotionSupported(supported);