Bug 996753 - Workaround for Fx33 not having AppConstants.Versions. r=rnewman, a=bustage
authorNick Alexander <nalexander@mozilla.com>
Thu, 18 Sep 2014 13:31:23 -0400
changeset 216793 7cd3ae0255ec
parent 216792 9f2dc7a2df34
child 216794 6d79bfddb02c
child 216796 73fcc8d4510c
child 216798 a34329afda87
push id3914
push userryanvm@gmail.com
push date2014-09-18 17:31 +0000
treeherdermozilla-beta@7cd3ae0255ec [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersrnewman, bustage
bugs996753
milestone33.0
Bug 996753 - Workaround for Fx33 not having AppConstants.Versions. r=rnewman, a=bustage
mobile/android/base/preferences/GeckoPreferences.java
--- a/mobile/android/base/preferences/GeckoPreferences.java
+++ b/mobile/android/base/preferences/GeckoPreferences.java
@@ -482,17 +482,18 @@ OnSharedPreferenceChangeListener
             "Sanitize:Finished");
         if (mPrefsRequestId > 0) {
             PrefsHelper.removeObserver(mPrefsRequestId);
         }
 
         // The intent extras will be null if this is the top-level settings
         // activity. In that case, we want to end the SETTINGS telmetry session.
         // For HC+ versions of Android this is handled in GeckoPreferenceFragment.
-        if (Versions.preHC && getIntent().getExtras() == null) {
+        final boolean versionsPreHC = Build.VERSION.SDK_INT < Build.VERSION_CODES.HONEYCOMB;
+        if (versionsPreHC && getIntent().getExtras() == null) {
             Telemetry.stopUISession(TelemetryContract.Session.SETTINGS);
         }
     }
 
     @Override
     public void onPause() {
         // Symmetric with onResume.
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {