Revert "Bug 29445: Enable support for enterprise policies" (e95c5153) · Commits · Tommy Webb / Tor Browser

browser/components/enterprisepolicies/EnterprisePolicies.js

+11 −2

Original line number	Diff line number	Diff line
		@@ -126,7 +126,7 @@ EnterprisePoliciesManager.prototype = {
		}

		if (policySchema.enterprise_only && !areEnterpriseOnlyPoliciesAllowed()) {
		log.error(`Enterprise policy ${policyName} is not allowed`);
		log.error(`Policy ${policyName} is only allowed on ESR`);
		continue;
		}

		@@ -314,6 +314,10 @@ let DisallowedFeatures = {};
		* Checks whether the policies marked as enterprise_only in the
		* schema are allowed to run on this browser.
		*
		* This is meant to only allow policies to run on ESR, but in practice
		* we allow it to run on channels different than release, to allow
		* these policies to be tested on pre-release channels.
		*
		* @returns {Bool} Whether the policy can run.
		*/
		function areEnterpriseOnlyPoliciesAllowed() {
		@@ -324,9 +328,14 @@ function areEnterpriseOnlyPoliciesAllowed() {
		return false;
		}

		if (AppConstants.MOZ_UPDATE_CHANNEL != "release" \|\|
		Cu.isInAutomation) {
		return true;
		}

		return false;
		}

		/*
		* JSON PROVIDER OF POLICIES
		*