Merge "Add drm and kernel permissions to mediaprovider" am: 224b4eac am:...

Merge "Add drm and kernel permissions to mediaprovider" am: 224b4eac am: 34b76844 am: b0e13e81
am: 1c5ea06a

Change-Id: Iadc8b0d884e69506e47855327f54027f7050387f

private/mediaprovider.te

@@ -17,6 +17,7 @@ allow mediaprovider cache_file:lnk_file r_file_perms;
 
 allow mediaprovider app_api_service:service_manager find;
 allow mediaprovider audioserver_service:service_manager find;
+allow mediaprovider drmserver_service:service_manager find;
 allow mediaprovider mediaserver_service:service_manager find;
 allow mediaprovider surfaceflinger_service:service_manager find;
 

public/kernel.te

@@ -53,6 +53,9 @@ allow kernel self:security setcheckreqprot;
 # kernel thread "loop0", used by the loop block device, for ASECs (b/17158723)
 allow kernel sdcard_type:file { read write };
 
+# f_mtp driver accesses files from kernel context.
+allow kernel mediaprovider:fd use;
+
 # Allow the kernel to read OBB files from app directories. (b/17428116)
 # Kernel thread "loop0" reads a vold supplied file descriptor.
 # Fixes CTS tests: