Bug 1234733 - Fix locale language tag in Honeycomb EOL url. r=liuche
authorMargaret Leibovic <margaret.leibovic@gmail.com>
Wed, 23 Dec 2015 10:35:17 -0500
changeset 277637 14aea198d5b18b4850801a23c61cbd066bf93f4f
parent 277636 869deb5491192921298b0a1edc0ab3fc17502648
child 277638 ffac5f6b750d2f93e91f1df33a9757db8c60fd13
push id29825
push userryanvm@gmail.com
push dateSat, 26 Dec 2015 01:49:53 +0000
treeherdermozilla-central@4a559a618d67 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersliuche
bugs1234733
milestone46.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 1234733 - Fix locale language tag in Honeycomb EOL url. r=liuche
mobile/android/base/java/org/mozilla/gecko/BrowserApp.java
--- a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java
+++ b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java
@@ -754,17 +754,17 @@ public class BrowserApp extends GeckoApp
         try {
             final SharedPreferences prefs = GeckoSharedPrefs.forProfile(this);
             if (!prefs.getBoolean(HONEYCOMB_EOL_NOTIFIED, false)) {
 
                 // Launch main App to load SUMO url on EOL notification.
                 final String link = getString(R.string.eol_notification_url,
                                               AppConstants.MOZ_APP_VERSION,
                                               AppConstants.OS_TARGET,
-                                              Locale.getDefault());
+                                              Locales.getLanguageTag(Locale.getDefault()));
 
                 final Intent intent = new Intent(Intent.ACTION_VIEW);
                 intent.setClassName(AppConstants.ANDROID_PACKAGE_NAME, AppConstants.MOZ_ANDROID_BROWSER_INTENT_CLASS);
                 intent.setData(Uri.parse(link));
                 final PendingIntent pendingIntent = PendingIntent.getActivity(this, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT);
 
                 final Notification notification = new NotificationCompat.Builder(this)
                         .setContentTitle(getString(R.string.eol_notification_title))