Skip to content
Snippets Groups Projects
Commit 2c4718fc authored by Jeff Vander Stoep's avatar Jeff Vander Stoep
Browse files

resolve merge conflicts of 56ed8a4d to stage-aosp-master 

Change-Id: Ic549f8c8060a17981302f2af75debf34595475bb
parents 7d9487c9 56ed8a4d
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 4 additions and 0 deletions
adbd.te
+ 4
− 0
View file @ 2c4718fc
...@@ -112,6 +112,10 @@ allow adbd mnt_user_file:lnk_file r_file_perms; ...@@ -112,6 +112,10 @@ allow adbd mnt_user_file:lnk_file r_file_perms;
allow adbd media_rw_data_file:dir create_dir_perms; allow adbd media_rw_data_file:dir create_dir_perms;
allow adbd media_rw_data_file:file create_file_perms; allow adbd media_rw_data_file:file create_file_perms;
r_dir_file(adbd, apk_data_file)
allow adbd rootfs:dir r_dir_perms;
### ###
### Neverallow rules ### Neverallow rules
### ###
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment