From 1c436bd911373810b2ac14088dd16762daf94191 Mon Sep 17 00:00:00 2001
From: Lajos Molnar <lajos@google.com>
Date: Wed, 10 Jun 2015 20:53:23 -0700
Subject: [PATCH] media: allow feature-can-swap-width-height to be optional.

We have enabled this only optionally in media_codecs.xml

Bug: 21568607
Change-Id: I11a12883afc051ba8c479255acc59388fb9a6722
---
 media/java/android/media/MediaCodecInfo.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media/java/android/media/MediaCodecInfo.java b/media/java/android/media/MediaCodecInfo.java
index 89d419af4e9dc..6c2622065954e 100644
--- a/media/java/android/media/MediaCodecInfo.java
+++ b/media/java/android/media/MediaCodecInfo.java
@@ -1382,7 +1382,7 @@ public final class MediaCodecInfo {
             // upper limit.
             // for now we are keeping the profile specific "width/height
             // in macroblocks" limits.
-            if (Integer.valueOf(1).equals(map.get("feature-can-swap-width-height"))) {
+            if (map.containsKey("feature-can-swap-width-height")) {
                 if (widths != null) {
                     mSmallerDimensionUpperLimit =
                         Math.min(widths.getUpper(), heights.getUpper());