Commit graph

3273 commits

Author SHA1 Message Date
Automerger Merge Worker
34d19eadbc Merge "Merge "Grant policy for BluetoothHal Extionsion feature" into tm-dev am: 5a222bc64e am: 9955721f73 am: 176327b908" into tm-qpr-dev-plus-aosp am: d9e51865a5
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/18349808

Change-Id: I6f032c844e287d25b6e9e8d0f53532061a141038
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 14:16:56 +00:00
Joner Lin
25da25e6dd Merge "Grant policy for BluetoothHal Extionsion feature" into tm-dev am: 5a222bc64e am: 9955721f73 am: 41026aeae6 am: 1668b2870e
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/18349808

Change-Id: Iaeaae34a6c0921ad81dd5b4d66cbd7f925ae4d37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 14:13:27 +00:00
Automerger Merge Worker
d9e51865a5 Merge "Merge "Grant policy for BluetoothHal Extionsion feature" into tm-dev am: 5a222bc64e am: 9955721f73 am: 176327b908" into tm-qpr-dev-plus-aosp 2022-05-20 13:25:50 +00:00
Joner Lin
d7b2f03490 Merge "Grant policy for BluetoothHal Extionsion feature" into tm-dev am: 5a222bc64e am: 9955721f73 am: 176327b908
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/18349808

Change-Id: I683c96bee3c35ab5963705cc016500099df04957
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 13:25:28 +00:00
Joner Lin
1668b2870e Merge "Grant policy for BluetoothHal Extionsion feature" into tm-dev am: 5a222bc64e am: 9955721f73 am: 41026aeae6
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/18349808

Change-Id: I024f0887f242c52d1e0232fb34a5b1538084209e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 13:25:13 +00:00
Joner Lin
41026aeae6 Merge "Grant policy for BluetoothHal Extionsion feature" into tm-dev am: 5a222bc64e am: 9955721f73
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/18349808

Change-Id: I513959f3ff0e5d1bcb81257538281e2b40f473af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 12:54:05 +00:00
Joner Lin
176327b908 Merge "Grant policy for BluetoothHal Extionsion feature" into tm-dev am: 5a222bc64e am: 9955721f73
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/18349808

Change-Id: Ib903eae506382e8ba93d829392b18402028a1d1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 12:48:37 +00:00
Joner Lin
9955721f73 Merge "Grant policy for BluetoothHal Extionsion feature" into tm-dev am: 5a222bc64e
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/18349808

Change-Id: If769c5b2f24bbb04f842c65e1e71bf21e86c4078
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 12:20:46 +00:00
Joner Lin
5a222bc64e Merge "Grant policy for BluetoothHal Extionsion feature" into tm-dev 2022-05-20 05:06:32 +00:00
George Chang
2d9ec80fed [automerger skipped] Merge "Revert "Update nfc from hidl to aidl service"" am: 610af798f5 am: bd74710d56 am: b75f28c76d am: 853b440b6f am: 2e6da947a3 -s ours
am skip reason: Merged-In I288474f691670655516728fe0e164a3e5689875c with SHA-1 130f2b784e is already in history. Merged-In was found from reverted change.

Reverted change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2098014

Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2098183

Change-Id: I0a615d0f39187e21f529b6e64e82ce584e54b77b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-19 18:48:16 +00:00
George Chang
2e6da947a3 Merge "Revert "Update nfc from hidl to aidl service"" am: 610af798f5 am: bd74710d56 am: b75f28c76d am: 853b440b6f
Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2098183

Change-Id: I986ee21e72b406946f488c95b6502e861ef7a0d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-19 17:42:55 +00:00
George Chang
853b440b6f Merge "Revert "Update nfc from hidl to aidl service"" am: 610af798f5 am: bd74710d56 am: b75f28c76d
Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2098183

Change-Id: Id3c8add8dd9f3ae88b425d5c355dddaac0ca7b2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-19 17:08:19 +00:00
George Chang
b75f28c76d Merge "Revert "Update nfc from hidl to aidl service"" am: 610af798f5 am: bd74710d56
Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2098183

Change-Id: I8a52af1a6344042571a4804c16c681d7981f38a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-19 16:34:07 +00:00
George Chang
bd74710d56 Merge "Revert "Update nfc from hidl to aidl service"" am: 610af798f5
Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2098183

Change-Id: I6db59e3a762df7b4906b0c14a7324b5955951c3d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-19 16:05:46 +00:00
George Chang
610af798f5 Merge "Revert "Update nfc from hidl to aidl service"" 2022-05-19 15:38:39 +00:00
George Chang
71db4c206b Revert "Update nfc from hidl to aidl service"
Revert submission 2098739-nfc_aidl_switch_gs101

Reason for revert: broken tests
Reverted Changes:
Ifde6ab418:Switch NFC from HIDL to AIDL
I288474f69:Update nfc from hidl to aidl service
Bug: 233194621
Change-Id: I1dad9c64073c8baffdf5f491c38bf1e568c9af29
2022-05-19 13:45:18 +00:00
Kyle Tso
a69cc7ca48 Merge "Add logbuffer_pogo_transfer file_contexts" am: 418d114796 am: 46b42ac02b am: 50797d0f2f am: d5e2b40846 am: 1f4c55de34
Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2098016

Change-Id: If2c8497fa93a0eff0edd91b3d8cc33151b9fc81b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-19 09:43:54 +00:00
George Chang
a142e1385e [automerger skipped] Update nfc from hidl to aidl service am: d6a8c63837 am: 8985f2ae28 am: 4b9fecbe3a am: 1a71964f04 am: be203cbb42 -s ours
am skip reason: Merged-In I288474f691670655516728fe0e164a3e5689875c with SHA-1 130f2b784e is already in history

Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2098014

Change-Id: I1b21bf026a398e99c77a99b0543e8770683ff8f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-19 09:43:12 +00:00
Kyle Tso
1f4c55de34 Merge "Add logbuffer_pogo_transfer file_contexts" am: 418d114796 am: 46b42ac02b am: 50797d0f2f am: d5e2b40846
Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2098016

Change-Id: I29f4faf31a13db8d68ae2322d7d6859d81818c37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-19 09:29:37 +00:00
George Chang
be203cbb42 Update nfc from hidl to aidl service am: d6a8c63837 am: 8985f2ae28 am: 4b9fecbe3a am: 1a71964f04
Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2098014

Change-Id: I00a5abacba420c463f7e8ac022a2b45c9776a71c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-19 08:55:16 +00:00
Kyle Tso
d5e2b40846 Merge "Add logbuffer_pogo_transfer file_contexts" am: 418d114796 am: 46b42ac02b am: 50797d0f2f
Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2098016

Change-Id: I321062c6de323fb11f2cda5300abd35ce1d0ea9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-19 08:54:59 +00:00
George Chang
1a71964f04 Update nfc from hidl to aidl service am: d6a8c63837 am: 8985f2ae28 am: 4b9fecbe3a
Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2098014

Change-Id: I254dda0055b8f8067675dfa3e65560a7a8ff9324
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-19 08:54:31 +00:00
Kyle Tso
50797d0f2f Merge "Add logbuffer_pogo_transfer file_contexts" am: 418d114796 am: 46b42ac02b
Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2098016

Change-Id: I41ef4daefa6a78ca4e3f7fa9a6464d43feda07ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-19 08:35:59 +00:00
George Chang
4b9fecbe3a Update nfc from hidl to aidl service am: d6a8c63837 am: 8985f2ae28
Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2098014

Change-Id: I8e04549075ae47a89994e2eed9b5e7f8eac170e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-19 08:35:44 +00:00
Kyle Tso
46b42ac02b Merge "Add logbuffer_pogo_transfer file_contexts" am: 418d114796
Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2098016

Change-Id: Ide608651968b6eb137aa55791074d66e3e27f947
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-19 07:56:40 +00:00
George Chang
8985f2ae28 Update nfc from hidl to aidl service am: d6a8c63837
Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2098014

Change-Id: If2212cb63fdf409ee7f5fbf78994c58c09caa8ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-19 07:55:22 +00:00
Kyle Tso
418d114796 Merge "Add logbuffer_pogo_transfer file_contexts" 2022-05-19 02:22:56 +00:00
jonerlin
9f214e0453 Grant policy for BluetoothHal Extionsion feature
Bug: 228943442
Test: Manually
Change-Id: I00b37c1f74ca9b904df2319d2c58d34228e9678b
2022-05-19 09:59:56 +08:00
Kyle Tso
94e2cdeb6e Add logbuffer_pogo_transfer file_contexts
Bug: 232556226
Signed-off-by: Kyle Tso <kyletso@google.com>
Change-Id: I1037d39f4187807e6aa9753339fae29e3bc89359
2022-05-17 16:01:46 +08:00
George Chang
d6a8c63837 Update nfc from hidl to aidl service
Bug: 216290344
Test: atest NfcNciInstrumentationTests
Test: atest VtsAidlHalNfcTargetTest
Merged-In: I288474f691670655516728fe0e164a3e5689875c
Change-Id: I288474f691670655516728fe0e164a3e5689875c
2022-05-17 12:16:39 +08:00
Suki Liu
13e8467fc0 Merge "Update avc error on ROM 8595544" 2022-05-17 02:11:01 +00:00
Orion Hodson
3893757352 Remove incidentd denial for apex_info_file am: 400d4fb7f4 am: 4fa31df30e am: 71f450f955 am: 32a87f289f am: ea2f827fd7
Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2098049

Change-Id: I621c4e5397c7af9676abc2ca0f35d6939b9cc6a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 20:28:50 +00:00
Orion Hodson
ea2f827fd7 Remove incidentd denial for apex_info_file am: 400d4fb7f4 am: 4fa31df30e am: 71f450f955 am: 32a87f289f
Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2098049

Change-Id: I4bafba96d95efd4167ae92e5acdf55e925ca1785
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 20:02:59 +00:00
Orion Hodson
32a87f289f Remove incidentd denial for apex_info_file am: 400d4fb7f4 am: 4fa31df30e am: 71f450f955
Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2098049

Change-Id: I91d505f428945306b9f747db018f7fbb3f0003a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 18:24:33 +00:00
Orion Hodson
71f450f955 Remove incidentd denial for apex_info_file am: 400d4fb7f4 am: 4fa31df30e
Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2098049

Change-Id: I7dc2d9dc20e060c9c2db2b9f98bd1292e0677033
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 16:59:14 +00:00
Orion Hodson
4fa31df30e Remove incidentd denial for apex_info_file am: 400d4fb7f4
Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2098049

Change-Id: I7b0683e254c0edd4f5dc60924f01fd36c0f8722c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 16:32:06 +00:00
Orion Hodson
400d4fb7f4 Remove incidentd denial for apex_info_file
Underlying issue addressed by https://r.android.com/1849822 which
gives incidentd r_file_perms for apex_info_file:file.

Fix: 187015816
Test: atest incidentd_test; adb logcat | grep denied
Change-Id: I90b57a5f01c97c8488c10692208080557a863051
2022-05-16 14:45:53 +01:00
sukiliu
101a021277 Update avc error on ROM 8595544
Bug: 232714489
Bug: 231821875
Test: PtsSELinuxTestCases
Change-Id: I4dd2c51dd237b19a110b24cb7ac8e1cb2284f99c
2022-05-16 12:00:57 +08:00
TreeHugger Robot
a9b034f9c1 Merge "Allow mediacodec to access vendor_data_file" into tm-dev am: c0d38cbc9f am: e9a23e8017 am: c92b8764b6 am: 04e4581b0a
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/18186340

Change-Id: I3129c0dfab49e25551077292540380e1d92236b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 17:54:33 +00:00
TreeHugger Robot
f53e420929 Merge "Allow mediacodec to access vendor_data_file" into tm-dev am: c0d38cbc9f am: ed1ec96363 am: 6ef9e20467 am: c7ce1131e0
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/18186340

Change-Id: I3d7b4e71b2dfdedfa30e18a9367933d31200cfcf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 16:27:16 +00:00
TreeHugger Robot
94f6621cea Merge "Allow mediacodec to access vendor_data_file" into tm-dev am: c0d38cbc9f am: ed1ec96363 am: a48761315f am: bc4e18cb88
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/18186340

Change-Id: I6324c7162488745d4f07522c5a05eba44ebe442e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 15:38:24 +00:00
TreeHugger Robot
04e4581b0a Merge "Allow mediacodec to access vendor_data_file" into tm-dev am: c0d38cbc9f am: e9a23e8017 am: c92b8764b6
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/18186340

Change-Id: I3895534e9b49d2f77770d513bf4c2425827779f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 11:07:47 +00:00
TreeHugger Robot
c7ce1131e0 Merge "Allow mediacodec to access vendor_data_file" into tm-dev am: c0d38cbc9f am: ed1ec96363 am: 6ef9e20467
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/18186340

Change-Id: I3c9910b8271a890b1e0b2ad3c6fb770e44742707
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 11:07:34 +00:00
TreeHugger Robot
bc4e18cb88 Merge "Allow mediacodec to access vendor_data_file" into tm-dev am: c0d38cbc9f am: ed1ec96363 am: a48761315f
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/18186340

Change-Id: I35c760c4ad912b1c4ed2ce176d94abe0b41fcffe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 11:06:41 +00:00
TreeHugger Robot
99369be2b0 Merge "Allow mediacodec to access vendor_data_file" into tm-dev am: c0d38cbc9f am: 9ceae2ff96
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/18186340

Change-Id: I44544211e779a729bec0686eb0ff1f8f4cb33c91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 10:46:31 +00:00
TreeHugger Robot
c92b8764b6 Merge "Allow mediacodec to access vendor_data_file" into tm-dev am: c0d38cbc9f am: e9a23e8017
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/18186340

Change-Id: I5d173aaed6b692627ff0ac1b2a240af59076dee3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 10:39:59 +00:00
TreeHugger Robot
6ef9e20467 Merge "Allow mediacodec to access vendor_data_file" into tm-dev am: c0d38cbc9f am: ed1ec96363
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/18186340

Change-Id: If0c21f56ade626fffe26b15730a6322bb5464eb9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 10:39:45 +00:00
TreeHugger Robot
a48761315f Merge "Allow mediacodec to access vendor_data_file" into tm-dev am: c0d38cbc9f am: ed1ec96363
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/18186340

Change-Id: I294f324c4c26521cb7d8553e6127281826c30a1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 10:39:44 +00:00
TreeHugger Robot
ed1ec96363 Merge "Allow mediacodec to access vendor_data_file" into tm-dev am: c0d38cbc9f
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/18186340

Change-Id: Iffeee5071854c1f2af2cad5c7a5783421980b153
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 09:49:23 +00:00
TreeHugger Robot
e9a23e8017 Merge "Allow mediacodec to access vendor_data_file" into tm-dev am: c0d38cbc9f
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/18186340

Change-Id: I6aa2cd70650dcebab561faf257d22d526a352052
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 09:48:07 +00:00