diff --git a/private/mac_permissions.xml b/private/mac_permissions.xml
index 87efe0e254ed6d60e641194d2031eda82cced1b0..1fcd2a409da016b09304b7408113aa7830d8b091 100644
--- a/private/mac_permissions.xml
+++ b/private/mac_permissions.xml
@@ -51,4 +51,9 @@
       <seinfo value="platform" />
     </signer>
 
+    <!-- Media key in AOSP -->
+    <signer signature="@MEDIA" >
+      <seinfo value="media" />
+    </signer>
+
 </policy>
diff --git a/private/mediaprovider.te b/private/mediaprovider.te
new file mode 100644
index 0000000000000000000000000000000000000000..a0ac0294f82f2902f15adde4ec9c6f6ab9951033
--- /dev/null
+++ b/private/mediaprovider.te
@@ -0,0 +1 @@
+app_domain(mediaprovider)
diff --git a/private/seapp_contexts b/private/seapp_contexts
index 6349a97f98aff7e8310062a65a9992ae7c66dd5e..12890018013667e794da1d0365d61ff316e12c4b 100644
--- a/private/seapp_contexts
+++ b/private/seapp_contexts
@@ -93,6 +93,7 @@ user=radio seinfo=platform domain=radio type=radio_data_file
 user=shared_relro domain=shared_relro
 user=shell seinfo=platform domain=shell type=shell_data_file
 user=_isolated domain=isolated_app levelFrom=user
+user=_app seinfo=media domain=mediaprovider name=android.process.media type=app_data_file levelFrom=user
 user=_app seinfo=platform domain=platform_app type=app_data_file levelFrom=user
 user=_app isEphemeralApp=true domain=ephemeral_app type=ephemeral_data_file levelFrom=all
 user=_app isPrivApp=true domain=priv_app type=app_data_file levelFrom=user
diff --git a/public/file.te b/public/file.te
index 80df22d768f554acc49a923d411f4003c8d76f33..66680e67a97e72456d54f51ec2fb4b6a49486a9d 100644
--- a/public/file.te
+++ b/public/file.te
@@ -59,7 +59,7 @@ type debugfs, fs_type;
 type debugfs_trace_marker, fs_type, debugfs_type, mlstrustedobject;
 type debugfs_tracing, fs_type, debugfs_type;
 type pstorefs, fs_type;
-type functionfs, fs_type;
+type functionfs, fs_type, mlstrustedobject;
 type oemfs, fs_type, contextmount_type;
 type usbfs, fs_type;
 type binfmt_miscfs, fs_type;
diff --git a/public/mediaprovider.te b/public/mediaprovider.te
new file mode 100644
index 0000000000000000000000000000000000000000..f34410bcb9cfc966d5f5ef4f699695ba08b5418f
--- /dev/null
+++ b/public/mediaprovider.te
@@ -0,0 +1,50 @@
+type mediaprovider, domain;
+
+# MtpServer uses /dev/mtp_usb
+allow mediaprovider mtp_device:chr_file rw_file_perms;
+
+# MtpServer uses /dev/usb-ffs/mtp
+allow mediaprovider functionfs:dir search;
+allow mediaprovider functionfs:file rw_file_perms;
+
+# MtpServer sets sys.usb.ffs.mtp.ready
+set_prop(mediaprovider, ffs_prop)
+
+allow mediaprovider mediacodec_service:service_manager find;
+allow mediaprovider mediadrmserver_service:service_manager find;
+allow mediaprovider mediaextractor_service:service_manager find;
+allow mediaprovider mediaserver_service:service_manager find;
+allow mediaprovider app_api_service:service_manager find;
+allow mediaprovider system_api_service:service_manager find;
+
+# /sys and /proc access
+r_dir_file(mediaprovider, sysfs_type)
+r_dir_file(mediaprovider, proc)
+r_dir_file(mediaprovider, rootfs)
+
+# Access to /data/preloads
+allow mediaprovider preloads_data_file:file r_file_perms;
+
+###
+### neverallow rules (see corresponding rules in priv_app)
+###
+
+# Receive or send uevent messages.
+neverallow mediaprovider domain:netlink_kobject_uevent_socket *;
+
+# Receive or send generic netlink messages
+neverallow mediaprovider domain:netlink_socket *;
+
+# Too much leaky information in debugfs. It's a security
+# best practice to ensure these files aren't readable.
+neverallow mediaprovider debugfs:file read;
+
+# Only trusted components of Android should be registering
+# services.
+neverallow mediaprovider service_manager_type:service_manager add;
+
+# Do not allow mediaprovider to be assigned mlstrustedsubject.
+neverallow mediaprovider mlstrustedsubject:process fork;
+
+# Do not allow mediaprovider to hard link to any files.
+neverallow mediaprovider file_type:file link;
diff --git a/public/priv_app.te b/public/priv_app.te
index 94d67172506ecc2ed0669c71dfd90717bafb7808..2f2bfab20fe02a987611fb065821b888bdf273e0 100644
--- a/public/priv_app.te
+++ b/public/priv_app.te
@@ -16,9 +16,6 @@ allow priv_app self:process ptrace;
 allow priv_app app_data_file:file rx_file_perms;
 auditallow priv_app app_data_file:file execute_no_trans;
 
-# android.process.media uses /dev/mtp_usb
-allow priv_app mtp_device:chr_file rw_file_perms;
-
 allow priv_app audioserver_service:service_manager find;
 allow priv_app cameraserver_service:service_manager find;
 allow priv_app drmserver_service:service_manager find;
@@ -34,10 +31,6 @@ allow priv_app system_api_service:service_manager find;
 allow priv_app persistent_data_block_service:service_manager find;
 allow priv_app recovery_service:service_manager find;
 
-# Traverse into /mnt/media_rw for bypassing FUSE daemon
-# TODO: narrow this to just MediaProvider
-allow priv_app mnt_media_rw_file:dir search;
-
 # Write to /cache.
 allow priv_app { cache_file cache_recovery_file }:dir create_dir_perms;
 allow priv_app { cache_file cache_recovery_file }:file create_file_perms;