Merge "Allow HWC to be binderized"

public/surfaceflinger.te

@@ -61,7 +61,11 @@ allow surfaceflinger tee_device:chr_file rw_file_perms;
 
 # media.player service
 add_service(surfaceflinger, gpu_service)
-add_service(surfaceflinger, surfaceflinger_service)
+
+# do not use add_service() as hal_graphics_composer_default may be the
+# provider as well
+#add_service(surfaceflinger, surfaceflinger_service)
+allow surfaceflinger surfaceflinger_service:service_manager { add find };
 
 allow surfaceflinger mediaserver_service:service_manager find;
 allow surfaceflinger permission_service:service_manager find;