Bug 1157733 - Tab Queue: Load View action intent normally if not in Nightly (r=mcomella)
authorMartyn Haigh <martyn.haigh@gmail.com>
Fri, 01 May 2015 15:06:26 +0100
changeset 273363 cb98d773829d0259bc4952d18b041a1a2c60ab95
parent 273362 b2a3462b18e3e520ae996adb9cb9b3c37710c97a
child 273364 cbe91037c39da7edff2d83093c538634ca05e52e
push id863
push userraliiev@mozilla.com
push dateMon, 03 Aug 2015 13:22:43 +0000
treeherdermozilla-release@f6321b14228d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmcomella
bugs1157733
milestone40.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 1157733 - Tab Queue: Load View action intent normally if not in Nightly (r=mcomella)
mobile/android/base/tabqueue/TabQueueDispatcher.java
--- a/mobile/android/base/tabqueue/TabQueueDispatcher.java
+++ b/mobile/android/base/tabqueue/TabQueueDispatcher.java
@@ -33,17 +33,17 @@ public class TabQueueDispatcher extends 
         super.onCreate(savedInstanceState);
 
         GeckoAppShell.ensureCrashHandling();
 
         ContextUtils.SafeIntent intent = new ContextUtils.SafeIntent(getIntent());
 
         // For the moment lets exit early and start fennec as normal if we're not in nightly with
         // the tab queue build flag.
-        if (!AppConstants.MOZ_ANDROID_TAB_QUEUE) {
+        if (!AppConstants.MOZ_ANDROID_TAB_QUEUE || !AppConstants.NIGHTLY_BUILD) {
             loadNormally(intent.getUnsafe());
             return;
         }
 
         // The URL is usually hiding somewhere in the extra text. Extract it.
         final String dataString = intent.getDataString();
         if (TextUtils.isEmpty(dataString)) {
             abortDueToNoURL(dataString);