Backed out changeset c273666082fa (bug 1325332) for Android test_interfaces.html failures
authorPhil Ringnalda <philringnalda@gmail.com>
Sun, 08 Jan 2017 21:17:41 -0800
changeset 328489 b1576b5adad1ca5a1e3ad8c6c8cfb951de19087e
parent 328488 68c4261192aceca8deb4db9d50d5c65b3f0bf5b3
child 328490 97896f92f196462e0072f8304b97c29217da1327
child 328521 1e65a894efcc158e4e0ad57d1f1d246c639526cd
push id31174
push usercbook@mozilla.com
push dateMon, 09 Jan 2017 09:32:17 +0000
treeherdermozilla-central@97896f92f196 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1325332
milestone53.0a1
backs outc273666082fac0829db0ec585247dc8914abab61
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset c273666082fa (bug 1325332) for Android test_interfaces.html failures
mobile/android/app/mobile.js
mobile/android/base/java/org/mozilla/gecko/media/MediaDrmProxy.java
--- a/mobile/android/app/mobile.js
+++ b/mobile/android/app/mobile.js
@@ -632,22 +632,16 @@ pref("media.android-remote-codec.enabled
 pref("media.android-remote-codec.enabled", false);
 #endif
 
 // Enable MSE
 pref("media.mediasource.enabled", true);
 
 pref("media.mediadrm-widevinecdm.visible", true);
 
-#ifdef NIGHTLY_BUILD
-// Enable EME(Encrypted media extensions)
-pref("media.eme.enabled", true);
-pref("media.eme.apiVisible", true);
-#endif
-
 // optimize images memory usage
 pref("image.downscale-during-decode.enabled", true);
 
 pref("browser.safebrowsing.downloads.enabled", false);
 
 pref("browser.safebrowsing.id", @MOZ_APP_UA_NAME@);
 
 // True if this is the first time we are showing about:firstrun
--- a/mobile/android/base/java/org/mozilla/gecko/media/MediaDrmProxy.java
+++ b/mobile/android/base/java/org/mozilla/gecko/media/MediaDrmProxy.java
@@ -42,18 +42,18 @@ public final class MediaDrmProxy {
     public static final ArrayList<MediaDrmProxy> sProxyList = new ArrayList<MediaDrmProxy>();
 
     // A flag to avoid using the native object that has been destroyed.
     private boolean mDestroyed;
     private GeckoMediaDrm mImpl;
     private String mDrmStubId;
 
     private static boolean isSystemSupported() {
-        // Support versions >= Marshmallow
-        if (AppConstants.Versions.preMarshmallow) {
+        // Support versions >= LOLLIPOP
+        if (AppConstants.Versions.preLollipop) {
             if (DEBUG) Log.d(LOGTAG, "System Not supported !!, current SDK version is " + Build.VERSION.SDK_INT);
             return false;
         }
         return true;
     }
 
     @WrapForJNI
     public static boolean isSchemeSupported(String keySystem) {