commit 43916281b7ecda0c4b8ff22d27aea605f51392af
author Treehugger Robot <treehugger-gerrit@google.com> Mon Feb 06 23:45:27 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Feb 06 23:45:27 2017 +0000
tree 4ed78fc008f82ace7b15b8178e7511c9fa281034
parent 4921085d9c7a188596914de415b3d2346ac44fda
parent 1b95d88c6d719e9b2475639599425ee856b5d1e9

Merge "Allow HWC to be binderized"

public/surfaceflinger.te

diff --git a/public/surfaceflinger.te b/public/surfaceflinger.te
index 3bdc97f..3f7a583 100644
--- a/public/surfaceflinger.te
+++ b/public/surfaceflinger.te
@@ -61,7 +61,11 @@
 
 # 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;

vendor/hal_graphics_composer_default.te

diff --git a/private/hal_graphics_composer_default.te b/vendor/hal_graphics_composer_default.te
similarity index 100%
rename from private/hal_graphics_composer_default.te
rename to vendor/hal_graphics_composer_default.te