From cf6a4ba5a4aed486b61b87597aa6572d41213ba2 Mon Sep 17 00:00:00 2001
From: Ronghua Wu <ronghuawu@google.com>
Date: Thu, 25 Jun 2015 14:13:40 -0700
Subject: [PATCH] media: parse max-concurrent-instances.

Bug: 22089269
Change-Id: I2b0af7c5c6a309c8396b595ea54b899451239b18
---
 media/java/android/media/MediaCodecInfo.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/media/java/android/media/MediaCodecInfo.java b/media/java/android/media/MediaCodecInfo.java
index 6c2622065954e..28d0713940dcf 100644
--- a/media/java/android/media/MediaCodecInfo.java
+++ b/media/java/android/media/MediaCodecInfo.java
@@ -705,6 +705,9 @@ public final class MediaCodecInfo {
 
             int maxInstances = Utils.parseIntSafely(
                     map.get("max-supported-instances"), mMaxSupportedInstances);
+            // TODO: replace all max-supported-instances with max-concurrent-instances.
+            maxInstances = Utils.parseIntSafely(
+                    map.get("max-concurrent-instances"), maxInstances);
             mMaxSupportedInstances =
                     Range.create(1, MAX_SUPPORTED_INSTANCES_LIMIT).clamp(maxInstances);