Skip to content
Snippets Groups Projects
Commit b46efbef authored by Alex Klyubin's avatar Alex Klyubin Committed by android-build-merger
Browse files

Merge "Unbreak user builds" into oc-dev

am: 46f9c124

Change-Id: I47dbd9e0ae33d7e052a7ebe891de40b146508173
parents a1c2cc15 46f9c124
No related branches found
No related tags found
No related merge requests found
......@@ -214,7 +214,12 @@ allowxperm domain devpts:chr_file ioctl unpriv_tty_ioctls;
# TODO(b/34454312) remove this when the correct policy is in place
allow domain default_android_hwservice:hwservice_manager { add find };
allow domain hwservice_manager_type:hwservice_manager { add find };
# Workaround for policy compiler being too aggressive and removing hwservice_manager_type
# when it's not explicitly used in allow rules
allow { domain -domain } hwservice_manager_type:hwservice_manager { add find };
# Workaround for policy compiler being too aggressive and removing vndservice_manager_type
# when it's not explicitly used in allow rules
allow { domain -domain } vndservice_manager_type:vndservice_manager { add find };
###
### neverallow rules
......
......@@ -509,8 +509,7 @@ define(`add_service', `
# others from adding it.
define(`add_hwservice', `
allow $1 $2:hwservice_manager { add find };
# TODO(b/34454312): Uncomment the neverallow once issues on user builds are resolved
# neverallow { domain -$1 } $2:hwservice_manager add;
neverallow { domain -$1 } $2:hwservice_manager add;
')
##########################################
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment