From: Dianne Hackborn <hackbod@google.com>
Date: Tue, 24 May 2011 18:27:11 +0000 (-0700)
Subject: resolved conflicts for merge of bbca8133 to master
X-Git-Url: https://git.saurik.com/android/aapt.git/commitdiff_plain/715618afe423f0b4234e82df4c8a6f572f6b086e?hp=03de9b7f4db2b8dac61f0154a9600c0371c000d3

resolved conflicts for merge of bbca8133 to master

Change-Id: I81493674dceab848e41d380a77a37e5a9be06db6
---

diff --git a/AaptAssets.cpp b/AaptAssets.cpp
index 75535f8..4894196 100644
--- a/AaptAssets.cpp
+++ b/AaptAssets.cpp
@@ -913,6 +913,11 @@ bool AaptGroupEntry::getUiModeTypeName(const char* name,
               (out->uiMode&~ResTable_config::MASK_UI_MODE_TYPE)
               | ResTable_config::UI_MODE_TYPE_CAR;
         return true;
+    } else if (strcmp(name, "television") == 0) {
+      if (out) out->uiMode =
+              (out->uiMode&~ResTable_config::MASK_UI_MODE_TYPE)
+              | ResTable_config::UI_MODE_TYPE_TELEVISION;
+        return true;
     }
 
     return false;