diff --git a/private/atrace.te b/private/atrace.te index 94d84834d116ddf9020232f883f2fec997a1f2b8..a57c6ecf26e028c780920ce4cc4c0e6d755ebb2e 100644 --- a/private/atrace.te +++ b/private/atrace.te @@ -3,7 +3,7 @@ type atrace_exec, exec_type, file_type; userdebug_or_eng(` - type atrace, domain, coredomain, domain_deprecated; + type atrace, domain, coredomain; init_daemon_domain(atrace) diff --git a/private/attributes b/private/attributes deleted file mode 100644 index fcbfecfb26a5495ae07230da0734a58971291187..0000000000000000000000000000000000000000 --- a/private/attributes +++ /dev/null @@ -1,9 +0,0 @@ -# Temporary attribute used for migrating permissions out of domain. -# Motivation: Domain is overly permissive. Start removing permissions -# from domain and assign them to the domain_deprecated attribute. -# Domain_deprecated and domain can initially be assigned to all -# domains. The goal is to not assign domain_deprecated to new domains -# and to start removing domain_deprecated where it's not required or -# reassigning the appropriate permissions to the inheriting domain -# when necessary. -attribute domain_deprecated; diff --git a/private/clatd.te b/private/clatd.te index c09398dddbc0a30ca85eabdf924a7879bd729b74..5ba0fc5cdcb99da7e531a630fc50aa621714dbf4 100644 --- a/private/clatd.te +++ b/private/clatd.te @@ -1,2 +1 @@ typeattribute clatd coredomain; -typeattribute clatd domain_deprecated; diff --git a/private/dex2oat.te b/private/dex2oat.te index 89c3970afcd68562e594a949c00a78e3ba2eb82a..fd45484f4db5bce7e3945b95dff8a76633e9d160 100644 --- a/private/dex2oat.te +++ b/private/dex2oat.te @@ -1,2 +1 @@ typeattribute dex2oat coredomain; -typeattribute dex2oat domain_deprecated; diff --git a/private/dhcp.te b/private/dhcp.te index 6a6a139e28c9c63a08e3f39d2973f5cab63ac360..b2f8ac7c747cf6bba0fe8080fa1afb8348b9ae95 100644 --- a/private/dhcp.te +++ b/private/dhcp.te @@ -1,5 +1,4 @@ typeattribute dhcp coredomain; -typeattribute dhcp domain_deprecated; init_daemon_domain(dhcp) type_transition dhcp system_data_file:{ dir file } dhcp_data_file; diff --git a/private/dumpstate.te b/private/dumpstate.te index 0fe2adfc68137d9099233ce0924f2471b7082460..b8f81526cddc1f713b42a4f2e83c97882c1d82dd 100644 --- a/private/dumpstate.te +++ b/private/dumpstate.te @@ -1,5 +1,4 @@ typeattribute dumpstate coredomain; -typeattribute dumpstate domain_deprecated; init_daemon_domain(dumpstate) diff --git a/private/fingerprintd.te b/private/fingerprintd.te index 0c1dfaa3748abb9a8c90e0c9edc48ce82a76c0a8..eb73ef8ccf9a3129f5a635c3f390d1177277e6f5 100644 --- a/private/fingerprintd.te +++ b/private/fingerprintd.te @@ -1,4 +1,3 @@ typeattribute fingerprintd coredomain; -typeattribute fingerprintd domain_deprecated; init_daemon_domain(fingerprintd) diff --git a/private/fsck.te b/private/fsck.te index e8467972fa00cab78cf61c76d722638d01f7a296..3a36329f7cca371944b2835dee1854966a754269 100644 --- a/private/fsck.te +++ b/private/fsck.te @@ -1,4 +1,3 @@ typeattribute fsck coredomain; -typeattribute fsck domain_deprecated; init_daemon_domain(fsck) diff --git a/private/fsck_untrusted.te b/private/fsck_untrusted.te index 2a1a39f46d1850e97b26ba177b748a9ed23a7550..9a57bf02771bb2a06bf59d5b0a922e96dcb81aa6 100644 --- a/private/fsck_untrusted.te +++ b/private/fsck_untrusted.te @@ -1,2 +1 @@ typeattribute fsck_untrusted coredomain; -typeattribute fsck_untrusted domain_deprecated; diff --git a/private/installd.te b/private/installd.te index d726e7df2e5165f8b8f649ceb2b90d4cae803a9a..f74843dd135d4f6550d2dc6ff8c58e1ac343c550 100644 --- a/private/installd.te +++ b/private/installd.te @@ -1,5 +1,4 @@ typeattribute installd coredomain; -typeattribute installd domain_deprecated; init_daemon_domain(installd) diff --git a/private/keystore.te b/private/keystore.te index 76aa02de3f911b169d0a87f4f1f24d748671b8f6..6aa888429255afbd4cc7edc8bf27c536b55afd33 100644 --- a/private/keystore.te +++ b/private/keystore.te @@ -1,4 +1,3 @@ typeattribute keystore coredomain; -typeattribute keystore domain_deprecated; init_daemon_domain(keystore) diff --git a/private/mtp.te b/private/mtp.te index 3cfda0b1aba7a7c0f15f0a7365e2475fe7c9a49f..732e111ed0b42407b3076a9ce971946b9a01e818 100644 --- a/private/mtp.te +++ b/private/mtp.te @@ -1,4 +1,3 @@ typeattribute mtp coredomain; -typeattribute mtp domain_deprecated; init_daemon_domain(mtp) diff --git a/private/netd.te b/private/netd.te index 3a824af13668b28303a126ca44c371ff887d52e3..f501f25e9f56361cb38813acec88f440a1ad7ee1 100644 --- a/private/netd.te +++ b/private/netd.te @@ -1,5 +1,4 @@ typeattribute netd coredomain; -typeattribute netd domain_deprecated; init_daemon_domain(netd) diff --git a/private/perfprofd.te b/private/perfprofd.te index a655f1d340320aa8c17cf0ef741ad35a70003abd..9c249fd9a069e4c455afaa2cba281610312f4a60 100644 --- a/private/perfprofd.te +++ b/private/perfprofd.te @@ -1,5 +1,4 @@ userdebug_or_eng(` typeattribute perfprofd coredomain; - typeattribute perfprofd domain_deprecated; init_daemon_domain(perfprofd) ') diff --git a/private/platform_app.te b/private/platform_app.te index a8bb1c285aace856e5dcc21225ab63f25fd5c3ee..02c12104e7c23a8d47a3cd16c5d37838ee88bea8 100644 --- a/private/platform_app.te +++ b/private/platform_app.te @@ -3,7 +3,6 @@ ### typeattribute platform_app coredomain; -typeattribute platform_app domain_deprecated; app_domain(platform_app) diff --git a/private/ppp.te b/private/ppp.te index 9b301f4757ba1bf92cd076bb6a8236c5f6191138..968b221b688ffe92f04a98d4211648a26d1e7ffc 100644 --- a/private/ppp.te +++ b/private/ppp.te @@ -1,4 +1,3 @@ typeattribute ppp coredomain; -typeattribute ppp domain_deprecated; domain_auto_trans(mtp, ppp_exec, ppp) diff --git a/private/radio.te b/private/radio.te index 83b5b416b248c2533f353e4afa62b8e7e585118e..b4f539048f3b56816ff9f011a6d1cf0349d6ef6b 100644 --- a/private/radio.te +++ b/private/radio.te @@ -1,5 +1,4 @@ typeattribute radio coredomain; -typeattribute radio domain_deprecated; app_domain(radio) diff --git a/private/recovery.te b/private/recovery.te index b7b2847ecf6ef7bf099abb02e5593912806167d3..2a7fdc7e1d3ad16a0b8f211def5313f91376c7dd 100644 --- a/private/recovery.te +++ b/private/recovery.te @@ -1,2 +1 @@ typeattribute recovery coredomain; -typeattribute recovery domain_deprecated; diff --git a/private/runas.te b/private/runas.te index 73a91ffd68f32ec11d3b2e40a927eb2c741cef30..ef31aac3471736662b840960b05e242ccb80856d 100644 --- a/private/runas.te +++ b/private/runas.te @@ -1,5 +1,4 @@ typeattribute runas coredomain; -typeattribute runas domain_deprecated; # ndk-gdb invokes adb shell run-as. domain_auto_trans(shell, runas_exec, runas) diff --git a/private/sdcardd.te b/private/sdcardd.te index ac6bb4e2c4da4da1493109efe95e4cf23b345d39..126d643490d7081ad0db7db021320aa74af171b8 100644 --- a/private/sdcardd.te +++ b/private/sdcardd.te @@ -1,4 +1,3 @@ typeattribute sdcardd coredomain; -typeattribute sdcardd domain_deprecated; type_transition sdcardd system_data_file:{ dir file } media_rw_data_file; diff --git a/private/shared_relro.te b/private/shared_relro.te index 8d06294d96a53ee83b7109af1e3781ca3fa4a85f..02f7206829d2901285479f95ed49fa656327e0d1 100644 --- a/private/shared_relro.te +++ b/private/shared_relro.te @@ -1,5 +1,4 @@ typeattribute shared_relro coredomain; -typeattribute shared_relro domain_deprecated; # The shared relro process is a Java program forked from the zygote, so it # inherits from app to get basic permissions it needs to run. diff --git a/private/system_app.te b/private/system_app.te index 803ee44244a1045af1c38c592a795fe0aa9b216b..23ad5ee1581f8bea631ab818c3f54c2b18fe75d4 100644 --- a/private/system_app.te +++ b/private/system_app.te @@ -5,7 +5,6 @@ ### typeattribute system_app coredomain; -typeattribute system_app domain_deprecated; app_domain(system_app) net_domain(system_app) diff --git a/private/system_server.te b/private/system_server.te index fdde2953dcd2add10bda4a98fb897e4b390b2a85..6dbf0378221ede806c9144b1cc751f1cb67ef200 100644 --- a/private/system_server.te +++ b/private/system_server.te @@ -4,7 +4,6 @@ # typeattribute system_server coredomain; -typeattribute system_server domain_deprecated; typeattribute system_server mlstrustedsubject; # Define a type for tmpfs-backed ashmem regions. diff --git a/private/ueventd.te b/private/ueventd.te index 0df587fffd1a5fd3cb81b3d3175c2a1d6a5b5014..1bd67735e99dc6ea00b17af8db5e4f03550311df 100644 --- a/private/ueventd.te +++ b/private/ueventd.te @@ -1,4 +1,3 @@ typeattribute ueventd coredomain; -typeattribute ueventd domain_deprecated; tmpfs_domain(ueventd) diff --git a/private/uncrypt.te b/private/uncrypt.te index fde686be99d2b09fbceaafb68a45d864815ab182..e4e9224d9d54910d303676d82c2a2b2ae3473f58 100644 --- a/private/uncrypt.te +++ b/private/uncrypt.te @@ -1,4 +1,3 @@ typeattribute uncrypt coredomain; -typeattribute uncrypt domain_deprecated; init_daemon_domain(uncrypt) diff --git a/private/update_engine.te b/private/update_engine.te index f460272d1dc2bb034678c46e2935bd4415cd5ec8..5af7db6817de8df41bab90c9bf82eacde78dcf74 100644 --- a/private/update_engine.te +++ b/private/update_engine.te @@ -1,4 +1,3 @@ typeattribute update_engine coredomain; -typeattribute update_engine domain_deprecated; init_daemon_domain(update_engine); diff --git a/private/vold.te b/private/vold.te index f2416f895e98f1586ec1b7d983b259627f70f5d3..a6d1001d1d48325e4fff25e4c15d888023ae297a 100644 --- a/private/vold.te +++ b/private/vold.te @@ -1,5 +1,4 @@ typeattribute vold coredomain; -typeattribute vold domain_deprecated; init_daemon_domain(vold) diff --git a/private/zygote.te b/private/zygote.te index e9ec6724ff53a5210f54865ed6d83a5d8655003b..885571b74fee3d069c54856b9786fdae1a384d1b 100644 --- a/private/zygote.te +++ b/private/zygote.te @@ -1,6 +1,5 @@ # zygote typeattribute zygote coredomain; -typeattribute zygote domain_deprecated; typeattribute zygote mlstrustedsubject; init_daemon_domain(zygote)