Commit graph

137 commits

Author SHA1 Message Date
Android Build Coastguard Worker
ae77d60780 Snap for 11545716 from 3b1ffa265a to 24Q3-release
Change-Id: I62d3e7c4fd5df7ee2a5c7600242fdfe60dc02c79
2024-03-08 00:01:19 +00:00
Xin Li
3b1ffa265a [automerger skipped] Merge Android 14 QPR2 to AOSP main am: 7ed79dfb03 -s ours am: 6ff8d1bb55 -s ours
am skip reason: Merged-In I29c5dc48dadf203f04d366823ce5955f37214543 with SHA-1 4db2ff2478 is already in history

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

Change-Id: I719ba35cb1de947453bea92287a032eabc9a935d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-07 10:46:52 +00:00
Xin Li
6ff8d1bb55 [automerger skipped] Merge Android 14 QPR2 to AOSP main am: 7ed79dfb03 -s ours
am skip reason: Merged-In I29c5dc48dadf203f04d366823ce5955f37214543 with SHA-1 4db2ff2478 is already in history

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

Change-Id: I49c4d8321fb0beab5e530d78c8311fe7ceaeddca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-07 09:55:28 +00:00
Xin Li
7ed79dfb03 Merge Android 14 QPR2 to AOSP main
Bug: 319669529
Merged-In: I29c5dc48dadf203f04d366823ce5955f37214543
Change-Id: Id09edd8f90ffe91cdded56713458c783705c4016
2024-03-06 09:29:47 -08:00
Xin Li
e0f065f358 [automerger skipped] Merge Android 24Q1 Release (ab/11220357) am: 4db2ff2478 -s ours
am skip reason: Merged-In I58be5961120c0ec5597a947c5ab6caa52aeb7bce with SHA-1 37bba82cfb is already in history

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

Change-Id: I45291ba09cc67a547fd30e7e56f36569023e1a58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-31 02:03:01 +00:00
Xin Li
4db2ff2478 Merge Android 24Q1 Release (ab/11220357)
Bug: 319669529
Merged-In: I58be5961120c0ec5597a947c5ab6caa52aeb7bce
Change-Id: I29c5dc48dadf203f04d366823ce5955f37214543
2024-01-17 22:12:27 -08:00
Xin Li
119b5312af [automerger skipped] Merge Android 14 QPR1 am: b722566c4c -s ours am: 203c2f1db1 -s ours am: 252c1232ec -s ours
am skip reason: Merged-In I08dbe6e19be27bc944766d6ac5c7bb3679215a22 with SHA-1 e109383517 is already in history

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

Change-Id: If66f2d8ac6aad2d40a80eb85ac4e7b2f6cc86d88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11 22:58:02 +00:00
Xin Li
252c1232ec [automerger skipped] Merge Android 14 QPR1 am: b722566c4c -s ours am: 203c2f1db1 -s ours
am skip reason: Merged-In I08dbe6e19be27bc944766d6ac5c7bb3679215a22 with SHA-1 e109383517 is already in history

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

Change-Id: I2b8b18f8836bf5d8f344dad43558d8e73958f207
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11 22:02:49 +00:00
Xin Li
203c2f1db1 [automerger skipped] Merge Android 14 QPR1 am: b722566c4c -s ours
am skip reason: Merged-In I08dbe6e19be27bc944766d6ac5c7bb3679215a22 with SHA-1 e109383517 is already in history

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

Change-Id: I202e62350835cce3c19f2eec43d06eacf81e5fc8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11 21:17:00 +00:00
Xin Li
b722566c4c Merge Android 14 QPR1
Merged-In: I08dbe6e19be27bc944766d6ac5c7bb3679215a22
Bug: 315507370
Change-Id: Ibda0bc8b525dda6fb3c37b4a59d975ecffe0c590
2023-12-08 13:13:16 -08:00
Xin Li
9e92505a49 [automerger skipped] Merge 10952656 am: e109383517 -s ours am: 07db3ad0a2 -s ours
am skip reason: Merged-In I9356b4a7581fd56e0905e2e69f93bc41cb1ac3ca with SHA-1 b621985731 is already in history

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

Change-Id: I7c5ec2bede0c0da3e87db2f455dc305f7944db6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-19 23:55:03 +00:00
Xin Li
07db3ad0a2 [automerger skipped] Merge 10952656 am: e109383517 -s ours
am skip reason: Merged-In I9356b4a7581fd56e0905e2e69f93bc41cb1ac3ca with SHA-1 b621985731 is already in history

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

Change-Id: If1e5f7becc138883e7870322fe21d5be2b37fad6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-19 18:48:17 +00:00
Xin Li
e109383517 Merge 10952656
Merged-In: I9356b4a7581fd56e0905e2e69f93bc41cb1ac3ca
Change-Id: I08dbe6e19be27bc944766d6ac5c7bb3679215a22
2023-10-17 10:06:16 -07:00
Xin Li
e7b465184b [automerger skipped] Merge Android 14 am: 5014853167 -s ours am: 533241dbc7 -s ours am: 9932fc5ef1 -s ours am: 3d9832070b -s ours am: b621985731 -s ours
am skip reason: Merged-In Iee0db5d439442fe7c689aaecfa214ea90dbe76b4 with SHA-1 54a353165c is already in history

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

Change-Id: Ic9d21331812a576ee81b94d32465b534c1209bd3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-07 00:20:03 +00:00
Xin Li
b621985731 [automerger skipped] Merge Android 14 am: 5014853167 -s ours am: 533241dbc7 -s ours am: 9932fc5ef1 -s ours am: 3d9832070b -s ours
am skip reason: Merged-In Iee0db5d439442fe7c689aaecfa214ea90dbe76b4 with SHA-1 54a353165c is already in history

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

Change-Id: I9356b4a7581fd56e0905e2e69f93bc41cb1ac3ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 11:00:33 +00:00
Xin Li
3d9832070b [automerger skipped] Merge Android 14 am: 5014853167 -s ours am: 533241dbc7 -s ours am: 9932fc5ef1 -s ours
am skip reason: Merged-In Iee0db5d439442fe7c689aaecfa214ea90dbe76b4 with SHA-1 54a353165c is already in history

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

Change-Id: Iee6d4902d5ae737a4f03d17f5a842187fdedaacf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 09:50:42 +00:00
Xin Li
9932fc5ef1 [automerger skipped] Merge Android 14 am: 5014853167 -s ours am: 533241dbc7 -s ours
am skip reason: Merged-In Iee0db5d439442fe7c689aaecfa214ea90dbe76b4 with SHA-1 54a353165c is already in history

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

Change-Id: I2e3756fa1b0690963fd5c9bcd86b0aeb5cd6c71b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 08:59:08 +00:00
Xin Li
533241dbc7 [automerger skipped] Merge Android 14 am: 5014853167 -s ours
am skip reason: Merged-In Iee0db5d439442fe7c689aaecfa214ea90dbe76b4 with SHA-1 54a353165c is already in history

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

Change-Id: If26733c497a61f2d165057ee18d4c3f18c228149
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 07:52:02 +00:00
Xin Li
5014853167 Merge Android 14
Bug: 298295554
Merged-In: Iee0db5d439442fe7c689aaecfa214ea90dbe76b4
Change-Id: I9bcfbd23f304c84d197383c4a294cce2fc1dc358
2023-10-05 15:32:49 -07:00
Will McVicker
37bba82cfb Move haptics sepolicy to gs101-sepolicy
The i2c-7/7-0043 label is shared with both i2c-7/i2c-cs40l25a and
i2c-7/i2c-cs40l26a nodes. To make it clear that these all are related,
let's move i2c-7/i2c-cs40l26a to gs101-sepolicy and have all the gs101
vibrator policy labels together.

Test: build on b3 and verify i2c nodes on r4
Bug: 291606723
Change-Id: I58be5961120c0ec5597a947c5ab6caa52aeb7bce
2023-09-29 09:16:22 -07:00
Roy Luo
5e130ea7c3 Revert "Update the cs40l26a i2c device node sepolicy labeling"
Revert submission 24855741-gs101-i2c-bus-fixes

Reason for revert: DroidMonitor-triggered revert due to breakage https://android-build.corp.google.com/builds/quarterdeck?branch=git_main&target=bluejay-trunk_food-userdebug&lkgb=10876543&lkbb=10876988&fkbb=10876587, bug b/302549624.

Reverted changes: /q/submissionid:24855741-gs101-i2c-bus-fixes

Change-Id: I1450fd464d661edbb7b3dc45bccc46f1e4d3a4bc
BUG: 302549624
2023-09-28 18:00:06 +00:00
Will McVicker
ccdd975a88 Update the cs40l26a i2c device node sepolicy labeling
This change needs to be merged with the corresponding kernel change that
sets the i2c bus aliases correctly to match the existing v5.10 bus
probe ordering.

To verify the sepolicy labeling doesn't change, run the below commands
and diff the stdout on builds with and without the changes. For extra
credit, verify the nodes are labeled the same when upgrading the kernel
to v6.1 (with the correct i2c aliases to match the existing policy):

  acpm_bus_array=("acpm_mfd_bus@17500000" "acpm_mfd_bus@17510000")
  for bus in ${acpm_bus_array[@]}; do
    adb shell ls -ZR /sys/devices/platform/${bus}/i2c-*;
  done

  bus_array=("10960000" "10970000" "10d50000" "10900000")
  for bus in ${bus_array[@]}; do
    adb shell ls -ZR /sys/devices/platform/${bus}.hsi2c/i2c-*;
  done

Test: verify on b3
Bug: 291606723
Change-Id: I36e41d7e2379b731c2092a679dc4e4042e0d3651
2023-09-18 15:37:54 -07:00
Desmond Huang
7595c2dae8 Relocate common tracking denial entries
Bug: 299029620
Change-Id: I15c42b09239e2c59b1a8d505f03fba260257d475
2023-09-14 14:13:19 +08:00
Tai Kuo
6bf0155cd4 Add more CS40L26 i2c paths am: 4fda2b1233 am: a1af213f9e
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay-sepolicy/+/24642760

Change-Id: I0714acaf39d02cd9c586d56f3cb72e803415318a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-07 05:20:19 +00:00
Tai Kuo
a1af213f9e Add more CS40L26 i2c paths am: 4fda2b1233
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay-sepolicy/+/24642760

Change-Id: I5caf7ee0f93f0006f5daa1e07e326582d47dbb24
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-07 04:24:24 +00:00
Tai Kuo
4fda2b1233 Add more CS40L26 i2c paths
Sometimes the I2C will not be in the usual allowlist, need to
enumerate possible paths to prevent unexpected vibrator behaviors.

Bug: 284969808
Test: full build
Test: Check normal and audio-coupled haptics function
Change-Id: I84772c484022b47cc6db79ecd96b327279f7dfbc
2023-09-04 17:54:36 +08:00
Xin Li
179a072afe [automerger skipped] Merge Android U (ab/10368041) am: 2d285414ab -s ours am: 398ca48e4d -s ours am: 1fabf987d7 -s ours am: 4ba9141388 -s ours
am skip reason: Merged-In I88fb867fd32347c9d43411d21206cef0ece5a774 with SHA-1 14a8173877 is already in history

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

Change-Id: I1a9a81a4ee0639b6986747f8477cc46aab0b7fc2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29 20:37:59 +00:00
Xin Li
4ba9141388 [automerger skipped] Merge Android U (ab/10368041) am: 2d285414ab -s ours am: 398ca48e4d -s ours am: 1fabf987d7 -s ours
am skip reason: Merged-In I88fb867fd32347c9d43411d21206cef0ece5a774 with SHA-1 14a8173877 is already in history

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

Change-Id: I3a42e829938588fdbf71befa412a88ac6510106d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29 01:10:53 +00:00
Xin Li
1fabf987d7 [automerger skipped] Merge Android U (ab/10368041) am: 2d285414ab -s ours am: 398ca48e4d -s ours
am skip reason: Merged-In I88fb867fd32347c9d43411d21206cef0ece5a774 with SHA-1 14a8173877 is already in history

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

Change-Id: Ia45e4c322d7bad3e33f8cd1704003a94af57b5f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29 00:35:09 +00:00
Xin Li
398ca48e4d [automerger skipped] Merge Android U (ab/10368041) am: 2d285414ab -s ours
am skip reason: Merged-In I88fb867fd32347c9d43411d21206cef0ece5a774 with SHA-1 14a8173877 is already in history

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

Change-Id: I457821430cf27c3d9572bca1c5bee885e6f03cc2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-28 23:59:09 +00:00
Xin Li
2d285414ab Merge Android U (ab/10368041)
Bug: 291102124
Merged-In: I88fb867fd32347c9d43411d21206cef0ece5a774
Change-Id: Ibfacad6f58670710644521ae50d3d32761dc3589
2023-08-14 15:33:02 -07:00
Leo Liou
1d9e672c22 bluejay: move ffu selinux rule into BOARD_VENDOR_SEPOLICY_DIRS am: 5431c78f3c am: 57e6fc8e36
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay-sepolicy/+/24072061

Change-Id: I131bcffad0f29524f808287d621c5483854a783a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-18 09:40:49 +00:00
Leo Liou
57e6fc8e36 bluejay: move ffu selinux rule into BOARD_VENDOR_SEPOLICY_DIRS am: 5431c78f3c
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay-sepolicy/+/24072061

Change-Id: I067b56cda89248244dee52dbc12eedd6e369fd3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-18 08:59:17 +00:00
Leo Liou
5431c78f3c bluejay: move ffu selinux rule into BOARD_VENDOR_SEPOLICY_DIRS
The ffu selinux rule don't work because it's not included by
BOARD_VENDOR_SEPOLICY_DIRS. Move it to bluejay folder and fix the
not working problem.

Bug: 273305600
Test: local build and test on B3
Change-Id: I7c9034b72b237508ecd9893fe86dee51d47c3c88
Signed-off-by: Leo Liou <leoliou@google.com>
2023-07-18 13:02:39 +08:00
DesmondH
5ba0e738ae Remove obsolete entries
Fix: 264600023
Fix: 275645961
Change-Id: If4ada1f505b9295f3415dea8cbd177694163a9a4
2023-06-28 05:31:36 +00:00
DesmondH
ad379fc0ae Remove fixed or obsolete entries
Bug: 240632681
Change-Id: I5176d220959aefd3e39acf34a3f80128b8348989
2023-06-14 16:51:41 +00:00
DesmondH
9525992cac Remove obsolete entries
Bug: 270080469
Bug: 264600240
Bug: 264483668
Change-Id: Iab8a37f169f3ff6e0d5be070567f6a455cd32c75
2023-06-02 03:21:19 +00:00
Ted Wang
c063bbb99c Add sepolicy for aidl bt extension hal am: b5b80403a1 am: 919b8cab96
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay-sepolicy/+/23241037

Change-Id: If2493b68812a04259880e1c428f2c0792ab52537
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-15 15:32:10 +00:00
Ted Wang
919b8cab96 Add sepolicy for aidl bt extension hal am: b5b80403a1
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay-sepolicy/+/23241037

Change-Id: I13cb0b1c554947367dbe8a61b58ad2d9eecb067c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-15 14:50:25 +00:00
Ted Wang
b5b80403a1 Add sepolicy for aidl bt extension hal
Bug: 280970790
Bug: 282685427
Test: make sepolicy and manual test
Change-Id: I54de5dce02eb8ba01a90b1f14389a36114d9e8b0
2023-05-15 12:40:51 +00:00
Adam Shih
4f2900f0a2 introduce a new sepolicy owner am: 54a353165c am: 7de640cd6f am: 5b30bb3e72 am: 14a8173877 am: aa9e7853aa am: 8bb1d9f2b4
Original change: https://android-review.googlesource.com/c/device/google/bluejay-sepolicy/+/2583111

Change-Id: I5e68e751a0179424856bf68a165cb4099e25dc1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-15 06:27:24 +00:00
Adam Shih
8bb1d9f2b4 introduce a new sepolicy owner am: 54a353165c am: 7de640cd6f am: 5b30bb3e72 am: 14a8173877 am: aa9e7853aa
Original change: https://android-review.googlesource.com/c/device/google/bluejay-sepolicy/+/2583111

Change-Id: I9860c20b0bd1a98e49c7b8fcd48b102fe907b535
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-15 05:40:34 +00:00
Adam Shih
aa9e7853aa introduce a new sepolicy owner am: 54a353165c am: 7de640cd6f am: 5b30bb3e72 am: 14a8173877
Original change: https://android-review.googlesource.com/c/device/google/bluejay-sepolicy/+/2583111

Change-Id: Ib45502f7de3d2adddd78df30cfe14b4195187c2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-15 05:04:42 +00:00
Adam Shih
14a8173877 introduce a new sepolicy owner am: 54a353165c am: 7de640cd6f am: 5b30bb3e72
Original change: https://android-review.googlesource.com/c/device/google/bluejay-sepolicy/+/2583111

Change-Id: I88fb867fd32347c9d43411d21206cef0ece5a774
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-15 04:22:18 +00:00
Adam Shih
5b30bb3e72 introduce a new sepolicy owner am: 54a353165c am: 7de640cd6f
Original change: https://android-review.googlesource.com/c/device/google/bluejay-sepolicy/+/2583111

Change-Id: I4bd272c81a405a5256c40de8e179dd0bdb28ae4b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-15 03:38:04 +00:00
Adam Shih
7de640cd6f introduce a new sepolicy owner am: 54a353165c
Original change: https://android-review.googlesource.com/c/device/google/bluejay-sepolicy/+/2583111

Change-Id: I08acdfec8ebe1783f5bfb18c1f68aea98ee71e3d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-15 02:59:47 +00:00
Adam Shih
54a353165c introduce a new sepolicy owner
Bug: 281631102
Test: N/A
Change-Id: Iee0db5d439442fe7c689aaecfa214ea90dbe76b4
2023-05-12 02:07:52 +00:00
Automerger Merge Worker
e8c642acf4 Merge "Merge "bluejay: add sepolicy for ufs_firmware_update process" into udc-dev am: 23c711561d am: dfa03c26b2" 2023-04-17 10:55:21 +00:00
Leo Liou
0f41bbae2a Merge "bluejay: add sepolicy for ufs_firmware_update process" into udc-dev am: 23c711561d am: 3ae91d9c27
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay-sepolicy/+/22158745

Change-Id: I2f3ae7593b78331cc25bb65ac10289a35c32bd43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-17 10:55:02 +00:00
Leo Liou
eb29aa76e1 Merge "bluejay: add sepolicy for ufs_firmware_update process" into udc-dev am: 23c711561d am: dfa03c26b2
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay-sepolicy/+/22158745

Change-Id: I3900216135f93491c31c43788b8f6cfa2a518241
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-17 10:55:02 +00:00