Commit graph

23050 commits

Author SHA1 Message Date
Automerger Merge Worker
916ce82fe2 Merge "access_vectors: remove incorrect comment about mac_admin" am: abba8e600e am: 310719d3ea
Change-Id: I69b794db915f57d9d68ee04a86fe4cb84415634f
2020-01-17 03:37:39 +00:00
Automerger Merge Worker
f3d9a24c68 Merge "Add selinux contexts for system_config_service" am: 13722174b7 am: 4d6ca6c90f
Change-Id: I7cf77f5d717bb901379483bb1437f45e9234bd49
2020-01-17 03:36:14 +00:00
Automerger Merge Worker
310719d3ea Merge "access_vectors: remove incorrect comment about mac_admin" am: abba8e600e
Change-Id: I21e45bcfd48abb4a0fc85e6451e1fa73f7907e9e
2020-01-17 03:25:38 +00:00
Automerger Merge Worker
4d6ca6c90f Merge "Add selinux contexts for system_config_service" am: 13722174b7
Change-Id: Iaf58372d5922403a14c7870571f097438d94425e
2020-01-17 03:23:57 +00:00
Treehugger Robot
abba8e600e Merge "access_vectors: remove incorrect comment about mac_admin" 2020-01-17 00:22:26 +00:00
Automerger Merge Worker
03a1842686 Merge "stable aidl Power HAL policy" am: fbe4afa7aa am: 4cb024e790
Change-Id: Ibd3e4024f15d0d488d3cda544e524efad2ac74f5
2020-01-16 22:57:07 +00:00
Automerger Merge Worker
2b4f17279d Merge "Configure SELinux for PowerManager Caches" am: fc52615d13 am: 6bc4c6660c
Change-Id: I4f605761fa3faa9b92f6535b9f3f595cbb304d8b
2020-01-16 22:56:54 +00:00
Treehugger Robot
13722174b7 Merge "Add selinux contexts for system_config_service" 2020-01-16 22:41:42 +00:00
Wei Wang
4cb024e790 Merge "stable aidl Power HAL policy"
am: fbe4afa7aa

Change-Id: Id2791733129f015b4364774ebc3f79b84b043dc4
2020-01-16 14:40:30 -08:00
Collin Fijalkovich
6bc4c6660c Merge "Configure SELinux for PowerManager Caches"
am: fc52615d13

Change-Id: I135086378fdb132480065629655f27264cbbd524
2020-01-16 14:40:05 -08:00
Wei Wang
fbe4afa7aa Merge "stable aidl Power HAL policy" 2020-01-16 22:35:42 +00:00
Collin Fijalkovich
fc52615d13 Merge "Configure SELinux for PowerManager Caches" 2020-01-16 19:34:10 +00:00
Automerger Merge Worker
550e7f28dd Merge "Fix spelling of 'system' for android.hardware.identity@1.0-service.example" am: 89277a412d am: 91c15d1bc2
Change-Id: I51e479beeafdba3e49078efb79c46fcfa4cae116
2020-01-16 19:11:28 +00:00
Automerger Merge Worker
655a52aa90 Merge "DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master" into stage-aosp-master am: e141b5713a
Change-Id: Id16bf1a6a4cabc1d97c5b7e8572d3afb786db744
2020-01-16 19:07:23 +00:00
David Zeuthen
91c15d1bc2 Merge "Fix spelling of 'system' for android.hardware.identity@1.0-service.example"
am: 89277a412d

Change-Id: Ifd1270d6fc278aaae44159140ce1165d1c9531d8
2020-01-16 10:47:10 -08:00
Treehugger Robot
89277a412d Merge "Fix spelling of 'system' for android.hardware.identity@1.0-service.example" 2020-01-16 18:43:34 +00:00
Automerger Merge Worker
8fc512c313 DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master am: 4761718f0b
Change-Id: I6208932ffa7b14922cb0e2d5de0971592655091b
2020-01-16 18:35:03 +00:00
TreeHugger Robot
e141b5713a Merge "DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master" into stage-aosp-master 2020-01-16 18:29:20 +00:00
Automerger Merge Worker
5f4f8d2429 Merge "Allow adbd to set/get persist.adb props, system_server to get." am: bda9c33ab1 am: ab5895c272
Change-Id: I4e7f5002e27d84be68db9e509d842d73aeb51a2a
2020-01-16 18:23:28 +00:00
Joshua Duong
ab5895c272 Merge "Allow adbd to set/get persist.adb props, system_server to get."
am: bda9c33ab1

Change-Id: I137ad8e14720729fd5ace7f6d5fef58dee324580
2020-01-16 09:56:58 -08:00
Joshua Duong
bda9c33ab1 Merge "Allow adbd to set/get persist.adb props, system_server to get." 2020-01-16 17:43:39 +00:00
Automerger Merge Worker
4e77006163 system_server: TelephonyManager reads /proc/cmdline am: 2951b4859d
Change-Id: I37906d269428d5e691395a1908aed9f647c27e11
2020-01-16 17:03:55 +00:00
Automerger Merge Worker
f255e9a434 Merge "system_server: TelephonyManager reads /proc/cmdline" am: 834c964d66 am: 557a90196b
Change-Id: I6b3ace0cd3340c5e919eb00c44c1586cfe08483f
2020-01-16 16:10:16 +00:00
Jeff Vander Stoep
557a90196b Merge "system_server: TelephonyManager reads /proc/cmdline"
am: 834c964d66

Change-Id: I136556f053bd3ad8097278c0d7c7cf05b5e7d56d
2020-01-16 08:02:38 -08:00
Treehugger Robot
834c964d66 Merge "system_server: TelephonyManager reads /proc/cmdline" 2020-01-16 15:52:02 +00:00
Stephen Smalley
871546058d access_vectors: remove incorrect comment about mac_admin
CAP_MAC_ADMIN was originally introduced into the kernel for use
by Smack and not used by SELinux. However, SELinux later appropriated
CAP_MAC_ADMIN as a way to control setting/getting security contexts
unknown to the currently loaded policy for use in labeling filesystems
while running a policy that differs from the one being applied to
the filesystem, in
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=12b29f34558b9b45a2c6eabd4f3c6be939a3980f
circa v2.6.27.

Hence, the comment about mac_admin being unused by SELinux is inaccurate.
Remove it.

The corresponding change to refpolicy is:
5fda529636

Test: policy builds

Change-Id: Ie3637882200732e498c53a834a27284da838dfb8
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
2020-01-16 10:29:15 -05:00
Automerger Merge Worker
ae4e0bde14 Merge "llkd: requires sys_admin permissions" am: 8943f24f02 am: caccc38181
Change-Id: I0543bf604afa5fcd47f04fa3a5afb366dcf37e26
2020-01-16 13:17:46 +00:00
Mark Salyzyn
caccc38181 Merge "llkd: requires sys_admin permissions"
am: 8943f24f02

Change-Id: Ife2cab2e62b83b75dc008330ddca18f84afc3e4a
2020-01-16 05:07:01 -08:00
Treehugger Robot
8943f24f02 Merge "llkd: requires sys_admin permissions" 2020-01-16 12:57:26 +00:00
Automerger Merge Worker
f8cafa6bec Merge "Add sepolicy for usb gadget hal v1.1" am: a1f829d3f8 am: 5b62692346
Change-Id: Ie61575ec59a2940c0c5d0622bd4ee0f73afd5ddf
2020-01-16 11:16:00 +00:00
Howard Yen
5b62692346 Merge "Add sepolicy for usb gadget hal v1.1"
am: a1f829d3f8

Change-Id: Id3c054560ef4c0146b772b49601ee5feac4a63d5
2020-01-16 03:03:11 -08:00
Treehugger Robot
a1f829d3f8 Merge "Add sepolicy for usb gadget hal v1.1" 2020-01-16 11:01:35 +00:00
Automerger Merge Worker
719d0b8f32 Merge "Allow gsid to create subdirectories under /metadata/gsi/dsu" am: 8b5a90a5e4 am: 15c1889f1e
Change-Id: I1b3aa7d88edca0e76f6293f04685d2227e777ea7
2020-01-16 06:14:50 +00:00
Howard Chen
15c1889f1e Merge "Allow gsid to create subdirectories under /metadata/gsi/dsu"
am: 8b5a90a5e4

Change-Id: I995519f2aca3c10c145ff46750cc5f959447ccde
2020-01-15 22:01:48 -08:00
Howard Chen
8b5a90a5e4 Merge "Allow gsid to create subdirectories under /metadata/gsi/dsu" 2020-01-16 05:33:09 +00:00
Automerger Merge Worker
f2bb2e241b Merge "Add rebootescrow default HAL rules" am: 1145b90b69 am: 4e4bb65056
Change-Id: Ic61717e043422485bb4d29ff3e617cadd048d5ed
2020-01-16 01:21:48 +00:00
Kenny Root
4e4bb65056 Merge "Add rebootescrow default HAL rules"
am: 1145b90b69

Change-Id: Id7d5053ead064a972470ef7edf399836aab55dab
2020-01-15 17:09:28 -08:00
Wei Wang
32b24c0f0b stable aidl Power HAL policy
Test: boot and dumpsys -l
Change-Id: I58022c9e0c24ba4e2d695acf63375c9f74c51b22
2020-01-15 16:53:40 -08:00
Treehugger Robot
1145b90b69 Merge "Add rebootescrow default HAL rules" 2020-01-16 00:24:59 +00:00
David Zeuthen
05ade22c65 Fix spelling of 'system' for android.hardware.identity@1.0-service.example
Bug: 111446262
Test: Manually
Change-Id: I37764f0ed580b4242e02c1958eabed88957adfd1
2020-01-15 19:05:24 -05:00
Xin Li
4761718f0b DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master
Bug: 146167222
Change-Id: I69802ecf86d5fa9957745ecfde4ce3e22545039f
2020-01-15 15:57:33 -08:00
Automerger Merge Worker
700b98a507 Merge "Add SELinux policy for Identity Credential HAL" am: a5527b4e46 am: 8924b794a7
Change-Id: Id058f8ff2777ea03cdd3100211607ab493ee407d
2020-01-15 23:32:39 +00:00
David Zeuthen
8924b794a7 Merge "Add SELinux policy for Identity Credential HAL"
am: a5527b4e46

Change-Id: I902e175a5d6aa8607018878bbc60cededb03144a
2020-01-15 15:22:15 -08:00
Treehugger Robot
a5527b4e46 Merge "Add SELinux policy for Identity Credential HAL" 2020-01-15 23:19:03 +00:00
Automerger Merge Worker
a68dee04ff Merge "perf_event: rules for system and simpleperf domain" am: f644c547ad am: 4f21e1c26b
Change-Id: If756d51ba6112f1a105bdc8a9792f25a290a4c54
2020-01-15 22:21:44 +00:00
Ryan Savitski
4f21e1c26b Merge "perf_event: rules for system and simpleperf domain"
am: f644c547ad

Change-Id: I7f89a1be41b2682571c9aeca129820405ad3c24c
2020-01-15 14:08:57 -08:00
Treehugger Robot
f644c547ad Merge "perf_event: rules for system and simpleperf domain" 2020-01-15 22:07:24 +00:00
Jeff Vander Stoep
2951b4859d system_server: TelephonyManager reads /proc/cmdline
Bug: 124466646
Test: build
Change-Id: Ib4868826eb153543c65503bfb4d3623c4158ffae
(cherry picked from commit 29b76e2ceec2ab1e04715657a79b6544afdf09c9)
2020-01-15 13:43:33 -08:00
Kenny Root
70c40e05f3 Add rebootescrow default HAL rules
Bug: 63928581
Test: build and check HAL label
Change-Id: I057b26eb20c5a6b022c7f391a6c8535f2953051c
2020-01-15 13:14:35 -08:00
Hall Liu
719bf1b8ca Add selinux contexts for system_config_service
Add selinux contexts for the new system config service.

Test: atest -it -w SystemConfigTest
Bug: 143112379
Change-Id: Ibe67acb404b6951e1fda9ce28bd50a0efdd44c5f
2020-01-15 11:15:29 -08:00