resolve merge conflicts of 56ed8a4d to stage-aosp-master am: 2c4718fc am: 77095f7c

am: 97a06910 Change-Id: If5b8835a07da4d4cb16f56c50570020a36c9b35c

resolve merge conflicts of 56ed8a4d to stage-aosp-master am: 2c4718fc am: 77095f7c
a3e1bee9 · Jeff Vander Stoep · android-build-merger · 116ca546 · 97a06910 · a3e1bee9
Commit a3e1bee9 authored 8 years ago by Jeff Vander Stoep Committed by android-build-merger 8 years ago
--- a/adbd.te
+++ b/adbd.te
@@ -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:file create_file_perms;

+r_dir_file(adbd, apk_data_file)
+
+allow adbd rootfs:dir r_dir_perms;
+
 ###
 ### Neverallow rules
 ###