From 8718e13062da7e6f54e104114867136fa32ba1aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Thu, 3 Dec 2020 14:38:08 +0100
Subject: [PATCH] [components] Handle GeckoView EME permission requests.

This allows Fenix to play EME content without having to toggle manually
`media.eme.require-app-approval=false` in `about:config`.

Closes https://github.com/mozilla-mobile/android-components/issues/7121

X-Channel-Revision: [main] mozilla-mobile/android-components@96444ddbd36acf0987ca531574187647bc74b5f3
X-Channel-Revision: [main] mozilla-mobile/fenix@d039188782084c5475112e6d98ab829c7992e759
X-Channel-Revision: [main] mozilla-mobile/focus-android@a9a09b171665081b4e5f4d426f0e30f22f84ae49
X-Channel-Converted-Revision: [main] mozilla-mobile/firefox-android@ac788e1caf34b2bae236d33221e53d9e9de77ce9
---
 _meta/mozilla-mobile-firefox-android-android-components.json    | 2 +-
 .../feature/sitepermissions/src/main/res/values/strings.xml     | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/_meta/mozilla-mobile-firefox-android-android-components.json b/_meta/mozilla-mobile-firefox-android-android-components.json
index a1d9b85ead0..34da58a5562 100644
--- a/_meta/mozilla-mobile-firefox-android-android-components.json
+++ b/_meta/mozilla-mobile-firefox-android-android-components.json
@@ -1,6 +1,6 @@
 {
   "name": "mozilla-mobile/firefox-android/android-components",
   "revs": {
-    "main": "89348a0424609ba7efcaaf83ad15cecd83dc504a"
+    "main": "ac788e1caf34b2bae236d33221e53d9e9de77ce9"
   }
 }
\ No newline at end of file
diff --git a/mozilla-mobile/android-components/components/feature/sitepermissions/src/main/res/values/strings.xml b/mozilla-mobile/android-components/components/feature/sitepermissions/src/main/res/values/strings.xml
index 02453eea998..24216413f7c 100644
--- a/mozilla-mobile/android-components/components/feature/sitepermissions/src/main/res/values/strings.xml
+++ b/mozilla-mobile/android-components/components/feature/sitepermissions/src/main/res/values/strings.xml
@@ -33,4 +33,6 @@
     <string name="mozac_feature_sitepermissions_never_allow">Never</string>
     <!-- Title of a dialog to require to save data in persistent storage. %1$s will be replaced with the URL of the current page -->
     <string name="mozac_feature_sitepermissions_persistent_storage_title">Allow %1$s to store data in persistent storage?</string>
+    <!-- Title of a dialog to use EME. %1$s will be replaced with the URL of the current page -->
+    <string name="mozac_feature_sitepermissions_media_key_system_access_title">Allow %1$s to play DRM-controlled content?</string>
 </resources>