From 21140badcb1046eb6b812ef1c3898c3a655b5c70 Mon Sep 17 00:00:00 2001 From: Chris Pearce Date: Tue, 19 Apr 2016 17:05:10 -0700 Subject: [PATCH] Bug 1265928 - Hide Adobe GMP on Windows XP. r=spohl,a=lizzard We need to revert bug 1234099 so that we don't show the plugin in the add-on manager on Windows XP, since now that unencrypted decoding via Adobe GMP is disabled, we won't be using the Adobe GMP. MozReview-Commit-ID: FWRSQaTXBY3 --- toolkit/modules/GMPUtils.jsm | 8 ++++++++ .../extensions/test/browser/browser_gmpProvider.js | 3 ++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/toolkit/modules/GMPUtils.jsm b/toolkit/modules/GMPUtils.jsm index 9d770fe496b..83fb0f4ef31 100644 --- a/toolkit/modules/GMPUtils.jsm +++ b/toolkit/modules/GMPUtils.jsm @@ -81,6 +81,14 @@ this.GMPUtils = { return false; } + if (Services.sysinfo.getPropertyAsInt32("version") < 6) { + // Windows versions before Vista are unsupported. + this.maybeReportTelemetry(aPlugin.id, + "VIDEO_EME_ADOBE_UNSUPPORTED_REASON", + GMPPluginUnsupportedReason.WINDOWS_VERSION); + return false; + } + return true; }, diff --git a/toolkit/mozapps/extensions/test/browser/browser_gmpProvider.js b/toolkit/mozapps/extensions/test/browser/browser_gmpProvider.js index 5f1c5d3b4a5..ba6ee6af49e 100644 --- a/toolkit/mozapps/extensions/test/browser/browser_gmpProvider.js +++ b/toolkit/mozapps/extensions/test/browser/browser_gmpProvider.js @@ -378,7 +378,8 @@ add_task(function* testEmeSupport() { let doc = gManagerWindow.document; let item = get_addon_element(gManagerWindow, addon.id); if (addon.id == GMPScope.EME_ADOBE_ID) { - if (Services.appinfo.OS == "WINNT") { + if (Services.appinfo.OS == "WINNT" && + Services.sysinfo.getPropertyAsInt32("version") >= 6) { Assert.ok(item, "Adobe EME supported, found add-on element."); } else { Assert.ok(!item,