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

@@ -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<RestrictionEntry> entries = new ArrayList<RestrictionEntry>();
 
         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);