Commit graph

1585 commits

Author SHA1 Message Date
TreeHugger Robot
df113325a5 Merge "thermal: thermal_metrics: Update selinux to reset stats" into udc-d1-dev 2023-05-25 05:28:46 +00:00
Leo Hsieh
3443d6d373 Merge "Allow hal_fingerprint_default to access sysfs_aoc_udfps" 2023-05-25 00:58:34 +00:00
Donnie Pollitz
16440338de Allow vendor_init to fix permissions of TEE data file
Background:
* vendor_init needs to be able to possibly fix ownership of
  tee_data_file

Bug: 280325952
Test: Changed permissions and confirmed user transitions
Change-Id: I2363f9ff695209bbf7b6661c8e9eb3b376b84ace
Signed-off-by: Donnie Pollitz <donpollitz@google.com>
2023-05-24 16:45:28 +02:00
Jimmy Hu
9f3215a000 Merge "Set sepolicy for shell script of disabling contaminant detection" into udc-d1-dev am: 86cb19bb2f am: 72f862ed29 am: 1ccbc11db5
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma-sepolicy/+/23341842

Change-Id: If64b3bea330a7782eeb81891e6e0af626a41e9a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 09:35:23 +00:00
Jimmy Hu
a6b09ce04e Merge "Set sepolicy for shell script of disabling contaminant detection" into udc-d1-dev am: 86cb19bb2f am: 9279426af4 am: 41369192ab
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma-sepolicy/+/23341842

Change-Id: Ic4b1dd6c02cffaf4ec285e49e5ba6763c020b531
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 09:34:07 +00:00
Jimmy Hu
1ccbc11db5 Merge "Set sepolicy for shell script of disabling contaminant detection" into udc-d1-dev am: 86cb19bb2f am: 72f862ed29
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma-sepolicy/+/23341842

Change-Id: I71631507e3a3f316b2db3cb5b086870401fe196b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 08:52:08 +00:00
Jimmy Hu
41369192ab Merge "Set sepolicy for shell script of disabling contaminant detection" into udc-d1-dev am: 86cb19bb2f am: 9279426af4
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma-sepolicy/+/23341842

Change-Id: Ieba000770bd6c6f9f419cb7dd3a56f24e91e3ed9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 08:49:56 +00:00
Jimmy Hu
72f862ed29 Merge "Set sepolicy for shell script of disabling contaminant detection" into udc-d1-dev am: 86cb19bb2f
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma-sepolicy/+/23341842

Change-Id: I77dec3ec400e338a662d51a0f3832e561dbdf1d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 08:29:49 +00:00
Jimmy Hu
9279426af4 Merge "Set sepolicy for shell script of disabling contaminant detection" into udc-d1-dev am: 86cb19bb2f
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma-sepolicy/+/23341842

Change-Id: I6a938dee1103a1b2b445669a5258f7470729248c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 08:25:48 +00:00
Jimmy Hu
86cb19bb2f Merge "Set sepolicy for shell script of disabling contaminant detection" into udc-d1-dev 2023-05-24 08:14:01 +00:00
Jin Jeong
4c8783ce96 Merge "Revert "[Zuma] Fix SeLinux error"" into udc-d1-dev am: f77e90366d am: 01bc6a6edb am: 4b3bca8f40
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma-sepolicy/+/23167570

Change-Id: Ide86f25d726da8bf9b5108e4ceed42b05924c9f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 03:13:37 +00:00
Jin Jeong
e19b6070d4 Merge "Revert "[Zuma] Fix SeLinux error"" into udc-d1-dev am: f77e90366d am: b4bac68874 am: 80af45ba72
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma-sepolicy/+/23167570

Change-Id: I6ac4bc6fad96365507a13b0d3bae1c3223d26b92
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 03:13:14 +00:00
Jin Jeong
4b3bca8f40 Merge "Revert "[Zuma] Fix SeLinux error"" into udc-d1-dev am: f77e90366d am: 01bc6a6edb
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma-sepolicy/+/23167570

Change-Id: I7817766c5a9d97d73a88d041c782dd8becfd2a64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 02:31:06 +00:00
Jin Jeong
80af45ba72 Merge "Revert "[Zuma] Fix SeLinux error"" into udc-d1-dev am: f77e90366d am: b4bac68874
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma-sepolicy/+/23167570

Change-Id: Id62f1ff7fb4f5a2623783711eb8e62064feb1f4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 02:25:04 +00:00
Jin Jeong
01bc6a6edb Merge "Revert "[Zuma] Fix SeLinux error"" into udc-d1-dev am: f77e90366d
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma-sepolicy/+/23167570

Change-Id: I5c731d28cba0a6073f8762c76f4b932f0befd80b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 01:45:51 +00:00
Jin Jeong
b4bac68874 Merge "Revert "[Zuma] Fix SeLinux error"" into udc-d1-dev am: f77e90366d
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma-sepolicy/+/23167570

Change-Id: I88f2266fdc8cf1f50fb3bcc6391d8b7f55715f62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 01:42:02 +00:00
Jin Jeong
f77e90366d Merge "Revert "[Zuma] Fix SeLinux error"" into udc-d1-dev 2023-05-24 01:07:12 +00:00
Wilson Sung
e889f684c3 Update SELinux error am: d73217d81f am: 951634d720 am: a9069e0cdd
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma-sepolicy/+/23364725

Change-Id: I823b18f5b79dba1e7967bf4c17dc8be2e504b524
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-23 11:16:08 +00:00
Wilson Sung
47bf4ca0a7 Update SELinux error am: d73217d81f am: f2042a36ab am: e30a1056fb
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma-sepolicy/+/23364725

Change-Id: If00e30067a45aaaf2abf1cf4ef5230baf3df8f35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-23 11:13:54 +00:00
Wilson Sung
a9069e0cdd Update SELinux error am: d73217d81f am: 951634d720
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma-sepolicy/+/23364725

Change-Id: I68abd4e279371a06a34c97c2c928c41246540ebc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-23 10:30:29 +00:00
Wilson Sung
e30a1056fb Update SELinux error am: d73217d81f am: f2042a36ab
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma-sepolicy/+/23364725

Change-Id: Iceb3e0805bca71944ab115f29c58ada28d302bf1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-23 10:28:37 +00:00
Wilson Sung
951634d720 Update SELinux error am: d73217d81f
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma-sepolicy/+/23364725

Change-Id: I0cc36602e12660f4bd186cbc4d98c6183f814ad0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-23 09:48:11 +00:00
Wilson Sung
f2042a36ab Update SELinux error am: d73217d81f
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma-sepolicy/+/23364725

Change-Id: I022bd1a22194279f776490d8af53452d92f3ce09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-23 09:44:10 +00:00
Wilson Sung
d73217d81f Update SELinux error
Test: SELinuxUncheckedDenialBootTest
Bug: 283725554
Test: scanBugreport
Bug: 283725554
Bug: 283725302
Test: scanAvcDeniedLogRightAfterReboot
Bug: 283725554
Change-Id: Ie482a46311c1dc1153ef04889e82971a09361e49
2023-05-22 15:01:49 +08:00
Kenny Root
b552d02d0c [automerger skipped] Merge "Add GSA logs policy" into udc-d1-dev am: 107d3314a4 am: 751150f9bc -s ours am: 92ec73dc3a -s ours
am skip reason: Merged-In I8842c0bec972c4cfad15ca689f8e4ae7fa99e179 with SHA-1 7be3a71942 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma-sepolicy/+/23268925

Change-Id: I680e4d97e76ba6f967ea5f68498efe05e9f39953
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-22 06:35:10 +00:00
Kenny Root
db6226ed8b [automerger skipped] Merge "Add GSA logs policy" into udc-d1-dev am: 107d3314a4 am: b1e5122f5b am: 6dd4b9338b -s ours
am skip reason: Merged-In I8842c0bec972c4cfad15ca689f8e4ae7fa99e179 with SHA-1 076591d107 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma-sepolicy/+/23268925

Change-Id: I90400f827f867eb3b399640c59b9e0f10b595a63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-22 06:34:19 +00:00
Kenny Root
92ec73dc3a [automerger skipped] Merge "Add GSA logs policy" into udc-d1-dev am: 107d3314a4 am: 751150f9bc -s ours
am skip reason: Merged-In I8842c0bec972c4cfad15ca689f8e4ae7fa99e179 with SHA-1 7be3a71942 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma-sepolicy/+/23268925

Change-Id: Iae62daf92725e624df0f4e788f19d490407d9ebb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-22 06:10:55 +00:00
Kenny Root
6dd4b9338b Merge "Add GSA logs policy" into udc-d1-dev am: 107d3314a4 am: b1e5122f5b
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma-sepolicy/+/23268925

Change-Id: If7a772bfecae240d7229810b8fc22f9328578033
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-22 06:08:47 +00:00
Kenny Root
751150f9bc Merge "Add GSA logs policy" into udc-d1-dev am: 107d3314a4
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma-sepolicy/+/23268925

Change-Id: Ic150e6aa8ca8eefbb0957871c176f5c0904d5d07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-22 05:42:14 +00:00
Kenny Root
b1e5122f5b Merge "Add GSA logs policy" into udc-d1-dev am: 107d3314a4
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma-sepolicy/+/23268925

Change-Id: Ib9c3b04f95760982a04b3b545115cc13786985ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-22 05:39:41 +00:00
Kenny Root
107d3314a4 Merge "Add GSA logs policy" into udc-d1-dev 2023-05-22 05:14:11 +00:00
Lawrence Huang
78131df600 Merge "Add net_domain for GCA on zuma devices" into udc-d1-dev am: 7bf6643438 am: 9897966578 am: 41132e4495
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma-sepolicy/+/23338581

Change-Id: I71327a290563c05e5f1ab14837c70f103bbe0833
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 22:23:22 +00:00
Lawrence Huang
4e5655b819 Merge "Add net_domain for GCA on zuma devices" into udc-d1-dev am: 7bf6643438 am: da39d4174a am: 4a15a8d448
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma-sepolicy/+/23338581

Change-Id: Ic45f57e2793919c10eb28d2fbc638cadc95d5ba8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 22:21:49 +00:00
Lawrence Huang
41132e4495 Merge "Add net_domain for GCA on zuma devices" into udc-d1-dev am: 7bf6643438 am: 9897966578
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma-sepolicy/+/23338581

Change-Id: I559cabd18cc00c1ac5954b4c48575b5af5cb9460
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 21:37:44 +00:00
Lawrence Huang
4a15a8d448 Merge "Add net_domain for GCA on zuma devices" into udc-d1-dev am: 7bf6643438 am: da39d4174a
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma-sepolicy/+/23338581

Change-Id: I6e967c863e136ae650860732bf332009a0e9d40b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 21:36:08 +00:00
Lawrence Huang
9897966578 Merge "Add net_domain for GCA on zuma devices" into udc-d1-dev am: 7bf6643438
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma-sepolicy/+/23338581

Change-Id: I4fcdf42bc673495deb3747a2ad7c7249787ca9fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 20:50:04 +00:00
Lawrence Huang
da39d4174a Merge "Add net_domain for GCA on zuma devices" into udc-d1-dev am: 7bf6643438
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma-sepolicy/+/23338581

Change-Id: Ia4e68a5f2b74985a1c8e15e43418a81dc22cc798
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 20:48:09 +00:00
Lawrence Huang
7bf6643438 Merge "Add net_domain for GCA on zuma devices" into udc-d1-dev 2023-05-19 19:59:58 +00:00
Jimmy Hu
70e6dd395b Set sepolicy for shell script of disabling contaminant detection
(ported from Ib2e3cf498851c0c9e5e74aacc9bf391549c0ad1a)

Bug: 263916675
Bug: 264231895
Test: setprop vendor.usb.contaminantdisable true
Change-Id: Ia451a6abc4a3c872c002efa323d06e9179bd656b
Signed-off-by: Jimmy Hu <hhhuuu@google.com>
2023-05-19 09:54:23 +00:00
Treehugger Robot
3072c4a1ee Merge "Remove selinux error bug reference after fixing" into udc-d1-dev am: b295326a78 am: fe0408840c am: d4943987ec
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma-sepolicy/+/23338576

Change-Id: I4345917671730fb66d27329d4bcc6f841b13e0a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 05:23:33 +00:00
Treehugger Robot
b19db37cdc Merge "Remove selinux error bug reference after fixing" into udc-d1-dev am: b295326a78 am: 45b4e68788 am: d97787af6a
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma-sepolicy/+/23338576

Change-Id: Ia5d287d7896d86c5b4747ff14f18570e6eca4b8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 05:22:44 +00:00
Treehugger Robot
d4943987ec Merge "Remove selinux error bug reference after fixing" into udc-d1-dev am: b295326a78 am: fe0408840c
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma-sepolicy/+/23338576

Change-Id: Icf6df94c61627741b777769dc460dcda78eaa6b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 04:44:48 +00:00
Treehugger Robot
d97787af6a Merge "Remove selinux error bug reference after fixing" into udc-d1-dev am: b295326a78 am: 45b4e68788
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma-sepolicy/+/23338576

Change-Id: I515451f0cd19165050226f9f2a5cdf301a04ecba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 04:40:50 +00:00
Prasanna Prapancham
49c0960467 add 8411 to logbuffer am: 9138d3d1de am: e8199c4239 am: 7337bd4da5
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma-sepolicy/+/23302169

Change-Id: If68b3e42daab98522c80ae115b7c4830c27a3aa0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 04:00:42 +00:00
Prasanna Prapancham
56eea097d7 add 8411 to logbuffer am: 9138d3d1de am: a64fd32572 am: 0ed9e533c3
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma-sepolicy/+/23302169

Change-Id: I2145136b9a5cd061caaf8e78a20d9721a8a9295a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 03:59:25 +00:00
Treehugger Robot
fe0408840c Merge "Remove selinux error bug reference after fixing" into udc-d1-dev am: b295326a78
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma-sepolicy/+/23338576

Change-Id: Ie4b290dcd5f481a9c8f43d49199af4adc4e9fbe7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 03:58:47 +00:00
Treehugger Robot
45b4e68788 Merge "Remove selinux error bug reference after fixing" into udc-d1-dev am: b295326a78
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma-sepolicy/+/23338576

Change-Id: I34dba1ef3b40020df96832e93b49ea8eb073e1fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 03:56:27 +00:00
Prasanna Prapancham
7337bd4da5 add 8411 to logbuffer am: 9138d3d1de am: e8199c4239
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma-sepolicy/+/23302169

Change-Id: I81d07155c50892b77705f18af530a54e0824dd49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 03:18:54 +00:00
Prasanna Prapancham
0ed9e533c3 add 8411 to logbuffer am: 9138d3d1de am: a64fd32572
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma-sepolicy/+/23302169

Change-Id: I16c398a087cf11b0c8060c2cfb3d96a5d8ebd370
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 03:16:59 +00:00
Treehugger Robot
b295326a78 Merge "Remove selinux error bug reference after fixing" into udc-d1-dev 2023-05-19 03:07:49 +00:00