Bug 853522 - Add some Samsung JB devices to stagefright blocklist - r=bjacob
authorChris Double <chris.double@double.co.nz>
Fri, 03 May 2013 15:08:24 -0400
changeset 141730 7ded7165ab8747234c14a5bb0a6c5b66c8f7522e
parent 141704 1e00967c5786041e818dc1478de2f1df2ec1e0ae
child 141731 5878a9a7c54083345f54051069c2ed7a1c336230
push id2579
push userakeybl@mozilla.com
push dateMon, 24 Jun 2013 18:52:47 +0000
treeherdermozilla-beta@b69b7de8a05a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbjacob
bugs853522
milestone23.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 853522 - Add some Samsung JB devices to stagefright blocklist - r=bjacob
widget/android/GfxInfo.cpp
--- a/widget/android/GfxInfo.cpp
+++ b/widget/android/GfxInfo.cpp
@@ -463,31 +463,31 @@ GfxInfo::GetFeatureStatusImpl(int32_t aF
           return NS_OK;
         }
       }
       else if (CompareVersions(mOSVersion.get(), "4.2.0") < 0)
       {
         // Whitelist:
         //   All JB phones except for those in blocklist below
         // Blocklist:
-        //   Samsung SPH-L710 (Bug 812881)
-        //   Samsung SGH-T999 (Bug 812881)
-        //   Samsung SCH-I535 (Bug 812881)
-        //   Samsung GT-I8190 (Bug 812881)
-        //   Samsung SGH-I747M (Bug 812881)
-        //   Samsung SGH-I747 (Bug 812881)
+        //   Samsung devices from bug 812881 and 853522.
         //   All Sony devices (Bug 845734)
 
         bool isBlocklisted =
-          cModel.Equals("SAMSUNG-SPH-L710", nsCaseInsensitiveCStringComparator()) ||
-          cModel.Equals("SAMSUNG-SGH-T999", nsCaseInsensitiveCStringComparator()) ||
-          cModel.Equals("SAMSUNG-SCH-I535", nsCaseInsensitiveCStringComparator()) ||
-          cModel.Equals("SAMSUNG-GT-I8190", nsCaseInsensitiveCStringComparator()) ||
-          cModel.Equals("SAMSUNG-SGH-I747M", nsCaseInsensitiveCStringComparator()) ||
-          cModel.Equals("SAMSUNG-SGH-I747", nsCaseInsensitiveCStringComparator()) ||
+          cModel.Find("SCH-I535", true) ||
+          cModel.Find("SGH-I747", true) ||
+          cModel.Find("SGH-T999", true) ||
+          cModel.Find("SPH-L710", true) ||
+          cModel.Find("GT-I8190", true) ||
+          cModel.Find("GT-P3100", true) ||
+          cModel.Find("GT-P3110", true) ||
+          cModel.Find("GT-P3113", true) ||
+          cModel.Find("GT-P5100", true) ||
+          cModel.Find("GT-P5110", true) ||
+          cModel.Find("GT-P5113", true) ||
           cManufacturer.Equals("Sony", nsCaseInsensitiveCStringComparator());
 
         if (isBlocklisted) {
           *aStatus = nsIGfxInfo::FEATURE_BLOCKED_DEVICE;
           return NS_OK;
         }
       }
     }