Skip to content
Snippets Groups Projects
Commit 77095f7c authored by Jeff Vander Stoep's avatar Jeff Vander Stoep Committed by android-build-merger
Browse files

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

am: 2c4718fc

Change-Id: I9d5bc1904eb8ee7bc5ea1203bc30274639e53caf
parents 25b13451 2c4718fc
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 @ 77095f7c
...@@ -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