From 29251b57f0f68ecd5dc4827e9fe73eaa2eb9089f Mon Sep 17 00:00:00 2001 From: Chris Double Date: Fri, 3 May 2013 11:00:23 +1200 Subject: [PATCH] Bug 845729 - Blocklist some Samsung devices on ICS - r=bjacob --HG-- extra : rebase_source : 620672aab4f726b05b0bcf31e29c61ca828888f6 --- widget/android/GfxInfo.cpp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/widget/android/GfxInfo.cpp b/widget/android/GfxInfo.cpp index d8d6c44516c4..c447d8a34806 100644 --- a/widget/android/GfxInfo.cpp +++ b/widget/android/GfxInfo.cpp @@ -439,9 +439,10 @@ GfxInfo::GetFeatureStatusImpl(int32_t aFeature, { // Whitelist: // All Samsung ICS devices, except for: - // Samsing SGH-I717 (Bug 845729) - // Samsing SGH-I727 (Bug 845729) - // Samsing SGH-T989 (Bug 845729) + // Samsung SGH-I717 (Bug 845729) + // Samsung SGH-I727 (Bug 845729) + // Samsung SGH-I757 (Bug 845729) + // Samsung SGH-T989 (Bug 845729) // All Galaxy nexus ICS devices // Sony Xperia Ion (LT28) ICS devices bool isWhitelisted = @@ -449,9 +450,10 @@ GfxInfo::GetFeatureStatusImpl(int32_t aFeature, cManufacturer.Equals("samsung", nsCaseInsensitiveCStringComparator()) || cModel.Equals("galaxy nexus", nsCaseInsensitiveCStringComparator()); // some Galaxy Nexus have manufacturer=amazon - if (cModel.Equals("SGH-I717", nsCaseInsensitiveCStringComparator()) || - cModel.Equals("SGH-I727", nsCaseInsensitiveCStringComparator()) || - cModel.Equals("SGH-T989", nsCaseInsensitiveCStringComparator())) + if (cModel.Find("SGH-I717", true) != -1 || + cModel.Find("SGH-I727", true) != -1 || + cModel.Find("SGH-I757", true) != -1 || + cModel.Find("SGH-T989", true) != -1) { isWhitelisted = false; }