am a0dfad55: am bb21fe8a: resolved conflicts for merge of 8be3e779 to stage-aosp-master
* commit 'a0dfad5588711691d9771e6ea93733e539bfd7e2':
move untrusted_app statement to the correct file.
diff --git a/app.te b/app.te
index 89c81cf..40ec610 100644
--- a/app.te
+++ b/app.te
@@ -119,11 +119,6 @@
# Read and write /data/data/com.android.providers.telephony files passed over Binder.
allow appdomain radio_data_file:file { read write getattr };
-# Read and write system app data files passed over Binder.
-# Motivating case was /data/data/com.android.settings/cache/*.jpg for
-# cropping or taking user photos.
-allow untrusted_app system_app_data_file:file { read write getattr };
-
# Access SDcard via the fuse mount.
allow appdomain fuse:dir create_dir_perms;
allow appdomain fuse:file create_file_perms;
diff --git a/untrusted_app.te b/untrusted_app.te
index e84e3ef..abcba78 100644
--- a/untrusted_app.te
+++ b/untrusted_app.te
@@ -55,6 +55,11 @@
# This line needs to be deleted.
allow untrusted_app anr_data_file:file r_file_perms;
+# Read and write system app data files passed over Binder.
+# Motivating case was /data/data/com.android.settings/cache/*.jpg for
+# cropping or taking user photos.
+allow untrusted_app system_app_data_file:file { read write getattr };
+
#
# Rules migrated from old app domains coalesced into untrusted_app.
# This includes what used to be media_app, shared_app, and release_app.