Backed out changeset 0bf07287d614 (bug 1405404) for failing android-test. r=backout
authorSebastian Hengst <archaeopteryx@coole-files.de>
Tue, 03 Oct 2017 20:18:57 +0200
changeset 384196 fc879542e9ae103605e7c5063d82e84a10bf771f
parent 384195 29a20bc04c6f95f8014238511d2cce7f299fabf3
child 384197 0db210721aa4cc46bd0566aa54406e8cd94b2bf2
push id52556
push userarchaeopteryx@coole-files.de
push dateTue, 03 Oct 2017 18:19:54 +0000
treeherderautoland@fc879542e9ae [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbackout
bugs1405404
milestone58.0a1
backs out0bf07287d61448f027f4f8de2e587a634bb70ec8
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
Backed out changeset 0bf07287d614 (bug 1405404) for failing android-test. r=backout
mobile/android/base/java/org/mozilla/gecko/activitystream/homepanel/ActivityStreamConfiguration.java
--- a/mobile/android/base/java/org/mozilla/gecko/activitystream/homepanel/ActivityStreamConfiguration.java
+++ b/mobile/android/base/java/org/mozilla/gecko/activitystream/homepanel/ActivityStreamConfiguration.java
@@ -17,26 +17,18 @@ import java.util.Set;
 /**
  * Static functions for accessing user configuration information.
  *
  * TODO (bug 1405161): we should move all configuration accesses to this class to centralize them.
  */
 public class ActivityStreamConfiguration {
 
     private static final Set<Locale> pocketEnabledLocales;
-
-    /**
-     * Notes for testing: Firefox for Android can get its locale from two places: the system locale and an override for
-     * this locale specified in Fennec settings. As such, you should be sure to test all locale updates with both
-     * settings when possible. For example, Deutsch will be "de-DE" in the Android system but "de" when using the Fennec
-     * override.
-     */
     @VisibleForTesting static final String[] pocketEnabledLocaleTags = new String[] {
             // Sorted alphabetically to preserve blame for additions/removals.
-            "de", // used by Firefox multi-locale builds.
             "de-AT",
             "de-CH",
             "de-DE",
             "en-GB",
             "en-US",
             "en-ZA",
     };