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 r4
Bug: 291606723
Change-Id: Id5b9021cdbf4b9d3578d5e9ee655463ab62dcd12
am skip reason: Merged-In I48441749de4eb1de90ce5a307b1d47ae3cb9592d with SHA-1 3770a8a19c is already in history
Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2752329
Change-Id: I533006b40e96b2d1d7cc8bff0591e2c33e0542e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
am skip reason: Merged-In I48441749de4eb1de90ce5a307b1d47ae3cb9592d with SHA-1 3770a8a19c is already in history
Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2752329
Change-Id: I0b8d04a7cd046a7fcd76d2fd06345922aa530299
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
am skip reason: Merged-In I48441749de4eb1de90ce5a307b1d47ae3cb9592d with SHA-1 3770a8a19c is already in history
Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2752329
Change-Id: I40a235b0baaf9b4ebc1076a7dd5882a00e1538ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
am skip reason: Merged-In I48441749de4eb1de90ce5a307b1d47ae3cb9592d with SHA-1 3770a8a19c is already in history
Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2752329
Change-Id: I1a06945bf1b20abf63cbefc425e823acc242810e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
am skip reason: Merged-In I48441749de4eb1de90ce5a307b1d47ae3cb9592d with SHA-1 3770a8a19c is already in history
Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2752329
Change-Id: I8fbbaacca0bfac26c62a0066dab8ba9c5e975a8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
am skip reason: Merged-In I48441749de4eb1de90ce5a307b1d47ae3cb9592d with SHA-1 3770a8a19c is already in history
Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2752329
Change-Id: Iac1344cac7c018817540e5a8772b68b24db9c6ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
am skip reason: Merged-In I48441749de4eb1de90ce5a307b1d47ae3cb9592d with SHA-1 3770a8a19c is already in history
Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2752329
Change-Id: I19d9164d09f38c3c587a3381180887d374953265
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
am skip reason: Merged-In I48441749de4eb1de90ce5a307b1d47ae3cb9592d with SHA-1 3770a8a19c is already in history
Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2752329
Change-Id: Ie650e0ecfaf8ab928dfbf624c10f5106a7a7f339
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
am skip reason: Merged-In I48441749de4eb1de90ce5a307b1d47ae3cb9592d with SHA-1 3770a8a19c is already in history
Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2752329
Change-Id: I401cabee30646852b1b4336631ad9bdac8b3f2ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
am skip reason: Merged-In I48441749de4eb1de90ce5a307b1d47ae3cb9592d with SHA-1 3770a8a19c is already in history
Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2752329
Change-Id: Ic15f340b025047af3342514397c8c14eeedd8200
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
am skip reason: Merged-In If1e70eb34f5225e1df329df31fbc7439c9e4fa4b with SHA-1 7e9c67cf47 is already in history
Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2752871
Change-Id: Ib476a8eacbcc8dd8a7930950f098096c6e943d2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
am skip reason: Merged-In If1e70eb34f5225e1df329df31fbc7439c9e4fa4b with SHA-1 7e9c67cf47 is already in history
Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2752871
Change-Id: I7331a25c608e501c2adc0735501fc744945cc7ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
am skip reason: Merged-In If1e70eb34f5225e1df329df31fbc7439c9e4fa4b with SHA-1 7e9c67cf47 is already in history
Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2752871
Change-Id: I502937a979af3982b1cd1db75b83a2cbf086147e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
am skip reason: Merged-In If1e70eb34f5225e1df329df31fbc7439c9e4fa4b with SHA-1 7e9c67cf47 is already in history
Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2752871
Change-Id: Ia042c1308f41f855be6ace07fc24c8d032cb02df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Coredomain apps shouldn't be labeled with vendor sepolicy, due to Treble
violation.
Bug: 280547417
Test: build bluejay and boot test
Merged-In: I48441749de4eb1de90ce5a307b1d47ae3cb9592d
Change-Id: I48441749de4eb1de90ce5a307b1d47ae3cb9592d
Coredomain apps shouldn't be labeled with vendor sepolicy, due to Treble
violation.
Bug: 280547417
Test: build bluejay and boot test
Change-Id: I48441749de4eb1de90ce5a307b1d47ae3cb9592d