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
This commit is contained in:
Chris Pearce 2016-04-19 17:05:10 -07:00
parent 6bd257ef9f
commit 21140badcb
2 changed files with 10 additions and 1 deletions

View File

@ -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;
},

View File

@ -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,