From 505f302fc0e33168dd4224bd195324b2f755fcf7 Mon Sep 17 00:00:00 2001 From: Sebastian Kaspari Date: Fri, 14 Aug 2015 17:31:47 +0200 Subject: [PATCH] Bug 1189402 - RestrictionProvider: Ignore location service restriction if stumbler is disabled at build time. r=ally --HG-- extra : commitid : LQuqvBirSVI extra : rebase_source : 75dce7df1a16200ff772a60370e96926b080adc8 --- mobile/android/base/restrictions/RestrictionProvider.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/mobile/android/base/restrictions/RestrictionProvider.java b/mobile/android/base/restrictions/RestrictionProvider.java index 4f2698dd0b3e..d69427576e35 100644 --- a/mobile/android/base/restrictions/RestrictionProvider.java +++ b/mobile/android/base/restrictions/RestrictionProvider.java @@ -8,6 +8,7 @@ package org.mozilla.gecko.restrictions; import org.mozilla.gecko.AppConstants; import org.mozilla.gecko.restrictions.RestrictedProfileConfiguration; import org.mozilla.gecko.restrictions.Restriction; +import org.mozilla.gecko.sync.setup.Constants; import android.annotation.TargetApi; import android.app.Activity; @@ -53,6 +54,10 @@ public class RestrictionProvider extends BroadcastReceiver { ArrayList entries = new ArrayList(); for (Restriction restriction : RestrictedProfileConfiguration.DEFAULT_RESTRICTIONS) { + if (restriction == Restriction.DISALLOW_LOCATION_SERVICE && !AppConstants.MOZ_STUMBLER_BUILD_TIME_ENABLED) { + continue; + } + RestrictionEntry entry = createRestrictionEntryWithDefaultValue(context, restriction, oldRestrictions.getBoolean(restriction.name, true)); entries.add(entry);