am 96246ad5: am 1dd3184e: Merge "address denials when playing protected content."

* commit '96246ad5':
  address denials when playing protected content.

mediaserver.te

@@ -62,3 +62,7 @@ allow mediaserver qtaguid_device:chr_file r_file_perms;
 
 # Allow abstract socket connection
 allow mediaserver rild:unix_stream_socket { connectto read write setopt };
+
+# Needed on some devices for playing DRM protected content,
+# but seems expected and appropriate for all devices.
+unix_socket_connect(mediaserver, drmserver, drmserver)

surfaceflinger.te

@@ -44,3 +44,8 @@ allow surfaceflinger bootanim:fd use;
 binder_call(surfaceflinger, dumpstate)
 binder_call(surfaceflinger, shell)
 allow surfaceflinger shell_data_file:file write;
+
+# Needed on some devices for playing DRM protected content,
+# but seems expected and appropriate for all devices.
+allow surfaceflinger tee:unix_stream_socket connectto;
+allow surfaceflinger tee_device:chr_file rw_file_perms;