commit 0f352fbd98affe4a95afd0327b8cf5279fb3d811
author Amy Hsu <amyhsu@google.com> Mon Jun 15 17:04:12 2020 +0800
committer Amy Hsu <amyhsu@google.com> Mon Jun 15 17:04:12 2020 +0800
tree 19741d190330ebc82181e8765a7b16f145a37d35
parent 3a180d2ef522a36177c714ee5ae4f11cb3618a02
parent 98412ab60466c148370dd4ee4b83d3bb1e0a069c

resolve merge conflicts of 98412ab60466c148370dd4ee4b83d3bb1e0a069c to rvc-dev-plus-aosp

Test: I solemnly swear I tested this conflict resolution.
Bug: None
Change-Id: I831c2feb3b86bfa2008ef6e5b74e81399d8145d8

private/property.te

diff --git a/private/property.te b/private/property.te
index 1aa4ddf..c5a4f83 100644
--- a/private/property.te
+++ b/private/property.te
@@ -406,3 +406,12 @@
 } {
   graphics_config_prop
 }:property_service set;
+
+neverallow {
+  -init
+  -vendor_init
+  -system_app
+} {
+  surfaceflinger_display_prop
+}:property_service set;
+