Bug 1301593 - Block versions of the Galaxy Note 4 from using the dynamic toolbar as well. r=sebastian a=ritu
authorKartikaya Gupta <kgupta@mozilla.com>
Tue, 13 Sep 2016 11:42:58 -0400
changeset 355762 5440c6019b43abcdc1d28304314b692a76106e10
parent 355761 c796e9b24f3cb6fe9432122b05df0257c27496cb
child 355763 92d639e21ef43fff9aef06b039a4da3666ef1f93
push id6570
push userraliiev@mozilla.com
push dateMon, 14 Nov 2016 12:26:13 +0000
treeherdermozilla-beta@f455459b2ae5 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssebastian, ritu
bugs1301593
milestone51.0a2
Bug 1301593 - Block versions of the Galaxy Note 4 from using the dynamic toolbar as well. r=sebastian a=ritu MozReview-Commit-ID: KOlIwP8xLhy
mobile/android/base/java/org/mozilla/gecko/DynamicToolbar.java
--- a/mobile/android/base/java/org/mozilla/gecko/DynamicToolbar.java
+++ b/mobile/android/base/java/org/mozilla/gecko/DynamicToolbar.java
@@ -55,19 +55,27 @@ public class DynamicToolbar {
     }
 
     public static boolean isForceDisabled() {
         // Force-disable dynamic toolbar on the variants of the Galaxy Note 10.1
         // and Note 8.0 running Android 4.1.2. (Bug 1231554). This includes
         // the following model numbers:
         //  GT-N8000, GT-N8005, GT-N8010, GT-N8013, GT-N8020
         //  GT-N5100, GT-N5110, GT-N5120
-        return Build.VERSION.SDK_INT == Build.VERSION_CODES.JELLY_BEAN
+        if (Build.VERSION.SDK_INT == Build.VERSION_CODES.JELLY_BEAN
             && (Build.MODEL.startsWith("GT-N80") ||
-                Build.MODEL.startsWith("GT-N51"));
+                Build.MODEL.startsWith("GT-N51"))) {
+            return true;
+        }
+        // Also disable variants of the Galaxy Note 4 on Android 5.0.1 (Bug 1301593)
+        if (Build.VERSION.SDK_INT == Build.VERSION_CODES.LOLLIPOP
+            && (Build.MODEL.startsWith("SM-910"))) {
+            return true;
+        }
+        return false;
     }
 
     public void destroy() {
         PrefsHelper.removeObserver(prefObserver);
     }
 
     public void setLayerView(LayerView layerView) {
         ThreadUtils.assertOnUiThread();