From 87263482c329de3047deba141588b921b4262da1 Mon Sep 17 00:00:00 2001
From: Chris Double <chris.double@double.co.nz>
Date: Mon, 18 Feb 2013 13:36:09 +1300
Subject: [PATCH] Bug 823253 - Part 3 - Whitelist Samsung Gingerbread devices
 for Stagefright decoding - r=bjacob

--HG--
extra : rebase_source : 2fcb3abcac2de4d03cb0c4ac8e98d3052dd5586f
---
 widget/android/GfxInfo.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/widget/android/GfxInfo.cpp b/widget/android/GfxInfo.cpp
index 95ba1a1cf1e..c2fb44c8941 100644
--- a/widget/android/GfxInfo.cpp
+++ b/widget/android/GfxInfo.cpp
@@ -372,9 +372,11 @@ GfxInfo::GetFeatureStatusImpl(int32_t aFeature,
           CompareVersions(mOSVersion.get(), "2.4.0") < 0)
       {
         // Gingerbread HTC devices are whitelisted.
-	// All other Gingerbread devices are blacklisted.
+        // Gingerbread Samsung devices are whitelisted.
+        // All other Gingerbread devices are blacklisted.
 	bool isWhitelisted =
-          cManufacturer.Equals("htc", nsCaseInsensitiveCStringComparator());
+          cManufacturer.Equals("htc", nsCaseInsensitiveCStringComparator()) ||
+          cManufacturer.Equals("samsung", nsCaseInsensitiveCStringComparator());
 
         if (!isWhitelisted) {
           *aStatus = nsIGfxInfo::FEATURE_BLOCKED_DEVICE;