Commit graph

3066 commits

Author SHA1 Message Date
Asad Ali
e754443b8b [automerger skipped] Merge "Update SELinux to allow CHRE to talk to the Wifi HAL" am: a022023a90 am: a9528564c0 -s ours am: 222d59bff3 -s ours am: f7c12d9b9c -s ours am: 4702e5f243 -s ours
am skip reason: Merged-In I73bcf96ed1cab0a101e5f84852a1d82258b9c690 with SHA-1 613bdcdec8 is already in history

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

Change-Id: Ib8ed704339d788f88e7fc15f107b8faaa8804035
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 11:35:02 +00:00
Treehugger Robot
c0f2484a99 [automerger skipped] Merge "android.hardware.usb.IUsb AIDL migration" am: c49520d66e am: fd65b31055 -s ours am: 766c16cc25 -s ours am: d0b2e4d807 -s ours am: 3d233ac79c -s ours
am skip reason: Merged-In Ia8c24610244856490c8271433710afb57d3da157 with SHA-1 51735ba3ab is already in history

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

Change-Id: Iba6dc0cf09e91a11b499bd2566fc36bd893e5cbf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 10:18:00 +00:00
George Chang
57cbdd934a Merge "Revert "Update nfc from hidl to aidl service"" 2022-04-29 23:01:02 +00:00
Asad Ali
4702e5f243 [automerger skipped] Merge "Update SELinux to allow CHRE to talk to the Wifi HAL" am: a022023a90 am: a9528564c0 -s ours am: 222d59bff3 -s ours am: f7c12d9b9c -s ours
am skip reason: Merged-In I73bcf96ed1cab0a101e5f84852a1d82258b9c690 with SHA-1 613bdcdec8 is already in history

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

Change-Id: Ibbb71ca203845b3c501461f0c3970e987635b691
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 21:54:25 +00:00
Treehugger Robot
3d233ac79c [automerger skipped] Merge "android.hardware.usb.IUsb AIDL migration" am: c49520d66e am: fd65b31055 -s ours am: 766c16cc25 -s ours am: d0b2e4d807 -s ours
am skip reason: Merged-In Ia8c24610244856490c8271433710afb57d3da157 with SHA-1 51735ba3ab is already in history

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

Change-Id: I234ae58c89ad7a57ff199b44cf1165c738b90dd4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 21:22:06 +00:00
Asad Ali
f7c12d9b9c [automerger skipped] Merge "Update SELinux to allow CHRE to talk to the Wifi HAL" am: a022023a90 am: a9528564c0 -s ours am: 222d59bff3 -s ours
am skip reason: Merged-In I73bcf96ed1cab0a101e5f84852a1d82258b9c690 with SHA-1 613bdcdec8 is already in history

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

Change-Id: Idd9184e4b1f1eaef7e45b86e3409f159e027e6c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 18:52:22 +00:00
Treehugger Robot
d0b2e4d807 [automerger skipped] Merge "android.hardware.usb.IUsb AIDL migration" am: c49520d66e am: fd65b31055 -s ours am: 766c16cc25 -s ours
am skip reason: Merged-In Ia8c24610244856490c8271433710afb57d3da157 with SHA-1 51735ba3ab is already in history

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

Change-Id: I0cd1b8b0935f2bb1887f48e3758a72546ce15a12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 18:50:01 +00:00
Asad Ali
222d59bff3 [automerger skipped] Merge "Update SELinux to allow CHRE to talk to the Wifi HAL" am: a022023a90 am: a9528564c0 -s ours
am skip reason: Merged-In I73bcf96ed1cab0a101e5f84852a1d82258b9c690 with SHA-1 613bdcdec8 is already in history

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

Change-Id: I2442828f4b15f36d034c9880f285f15ae45ce264
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 18:10:22 +00:00
Treehugger Robot
766c16cc25 [automerger skipped] Merge "android.hardware.usb.IUsb AIDL migration" am: c49520d66e am: fd65b31055 -s ours
am skip reason: Merged-In Ia8c24610244856490c8271433710afb57d3da157 with SHA-1 51735ba3ab is already in history

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

Change-Id: I880380a11236430157096e3d3823e1734dd4dfa7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 18:01:30 +00:00
George Chang
63c1e192e7 Revert "Update nfc from hidl to aidl service"
This reverts commit dc8bd46527.

Reason for revert: Broken tests
Bug: 230834308
Change-Id: I964632a92cb741c703e4d8d3e8623454541022e7
2022-04-29 15:39:47 +00:00
George Chang
b6a1a56380 Merge "Update nfc from hidl to aidl service" 2022-04-29 06:57:47 +00:00
Wei Wang
3ae3f2bfdf allow udfps hal to access trusty am: 615f85c22d am: b94efeaff0 am: 583a242d9b am: 5be2bec4e6
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17982120

Change-Id: I5ac5039cc29b057c0a1bfffe03c75619dcd5ed40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 03:43:32 +00:00
George Chang
dc8bd46527 Update nfc from hidl to aidl service
Bug: 216290344
Test: atest NfcNciInstrumentationTests
Test: atest VtsAidlHalNfcTargetTest
Change-Id: I3d17eacddadaf78520edb1a94e17e091cbdba4c0
2022-04-28 15:33:39 +00:00
Wei Wang
0b08e48566 allow udfps hal to access trusty am: 615f85c22d am: daf2093583 am: f041f70a21 am: aaa50748bc
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17982120

Change-Id: I6a4938f0671b247d68c350ae6d6830509d0cb15d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 07:53:51 +00:00
Asad Ali
a9528564c0 Merge "Update SELinux to allow CHRE to talk to the Wifi HAL" am: a022023a90
Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2077149

Change-Id: I196d9c8349e352c630b11441bf3280d456a75118
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 07:51:24 +00:00
Wei Wang
04905148ce allow udfps hal to access trusty am: 615f85c22d am: b94efeaff0 am: b9f0680283 am: ec6ae16e0b
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17982120

Change-Id: I0cabc6cc6563dd5e89aa410cd7cd7c32f7f88244
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 07:08:47 +00:00
Asad Ali
a022023a90 Merge "Update SELinux to allow CHRE to talk to the Wifi HAL" 2022-04-28 07:05:14 +00:00
Wei Wang
5be2bec4e6 allow udfps hal to access trusty am: 615f85c22d am: b94efeaff0 am: 583a242d9b
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17982120

Change-Id: Ib2a2c3a9ddd1f4f8e8570e31629f98cf76b08113
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 02:52:11 +00:00
Wei Wang
aaa50748bc allow udfps hal to access trusty am: 615f85c22d am: daf2093583 am: f041f70a21
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17982120

Change-Id: I734b1cb28342c0cb0ae99deeaa8f000e3f532081
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 02:51:32 +00:00
Wei Wang
ec6ae16e0b allow udfps hal to access trusty am: 615f85c22d am: b94efeaff0 am: b9f0680283
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17982120

Change-Id: Ia36da932a460a31168194288a7d4a15b2164d7cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 02:51:09 +00:00
Wei Wang
583a242d9b allow udfps hal to access trusty am: 615f85c22d am: b94efeaff0
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17982120

Change-Id: I8c55549d01528b33cbf4333930c4c4c0a8281e73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 02:10:03 +00:00
Wei Wang
f041f70a21 allow udfps hal to access trusty am: 615f85c22d am: daf2093583
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17982120

Change-Id: I90d58607416a0874ca4a80ecb46d902f8764e8ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 02:09:50 +00:00
Wei Wang
b9f0680283 allow udfps hal to access trusty am: 615f85c22d am: b94efeaff0
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17982120

Change-Id: I45576b46edad47a0614534f0a503a99036936e55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 02:09:40 +00:00
Wei Wang
55b71bf208 allow udfps hal to access trusty am: 615f85c22d am: a68059705b
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17982120

Change-Id: If423807ae19d1396e2a15f4b3deec3faf6125e08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 02:09:10 +00:00
Wei Wang
b94efeaff0 allow udfps hal to access trusty am: 615f85c22d
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17982120

Change-Id: I021692200c0bc229f23d573685f1ca75c4fb0ca1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 01:15:56 +00:00
Wei Wang
a68059705b allow udfps hal to access trusty am: 615f85c22d
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17982120

Change-Id: I1859ad36b4a2e48d87533f22e777112fe6ac031b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 01:14:47 +00:00
Wei Wang
daf2093583 allow udfps hal to access trusty am: 615f85c22d
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17982120

Change-Id: I4d62137c19cbccd9ce294f2c34c40199b60e3b57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 01:14:20 +00:00
Wei Wang
615f85c22d allow udfps hal to access trusty
Bug: 229350721
Bug: 230492593
Test: UDFPS with stress
Signed-off-by: Wei Wang <wvw@google.com>
Change-Id: Ib1abe0e0318689528a6658f3597f1c11ad9fa1c3
2022-04-27 20:20:43 +00:00
Treehugger Robot
fd65b31055 Merge "android.hardware.usb.IUsb AIDL migration" am: c49520d66e
Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2044871

Change-Id: Ib0ea1d39f90456062a1d18ac86ff8c6140cb29eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 17:39:58 +00:00
Treehugger Robot
c49520d66e Merge "android.hardware.usb.IUsb AIDL migration" 2022-04-27 16:21:29 +00:00
Anthony Stange
8c311f981b Update SELinux to allow CHRE to talk to the Wifi HAL
Bug: 206614765
Test: Run locally
Change-Id: I73bcf96ed1cab0a101e5f84852a1d82258b9c690
Merged-In: I73bcf96ed1cab0a101e5f84852a1d82258b9c690
2022-04-27 06:13:14 +00:00
Edmond Chung
89b31263c0 [automerger skipped] Camera: add setsched capability. am: 99b4aebb6a am: a287bef991 -s ours am: bdd7f4ca53 -s ours am: d99f3881c6 -s ours am: 1859147fa3 -s ours
am skip reason: Merged-In Ifbf433c026549ca774a9521704d0b0b75c9e9f23 with SHA-1 2715a08a73 is already in history

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

Change-Id: I7958cb859b2dcd075605fdfb5774bcbbff0b86da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-26 22:01:19 +00:00
Edmond Chung
1859147fa3 [automerger skipped] Camera: add setsched capability. am: 99b4aebb6a am: a287bef991 -s ours am: bdd7f4ca53 -s ours am: d99f3881c6 -s ours
am skip reason: Merged-In Ifbf433c026549ca774a9521704d0b0b75c9e9f23 with SHA-1 2715a08a73 is already in history

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

Change-Id: Iaa8dbe6c54273c3dab6c52cff2bccf75a1a70ea9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-26 21:38:31 +00:00
Edmond Chung
d99f3881c6 [automerger skipped] Camera: add setsched capability. am: 99b4aebb6a am: a287bef991 -s ours am: bdd7f4ca53 -s ours
am skip reason: Merged-In Ifbf433c026549ca774a9521704d0b0b75c9e9f23 with SHA-1 2715a08a73 is already in history

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

Change-Id: Ic110cb2ce1580b19d6acb94a6f7d2e3d02595c6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-26 21:15:49 +00:00
Edmond Chung
bdd7f4ca53 [automerger skipped] Camera: add setsched capability. am: 99b4aebb6a am: a287bef991 -s ours
am skip reason: Merged-In Ifbf433c026549ca774a9521704d0b0b75c9e9f23 with SHA-1 2715a08a73 is already in history

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

Change-Id: Ic494c66247402a0839fa839049196aff29f5d97a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-26 20:54:38 +00:00
Edmond Chung
a287bef991 Camera: add setsched capability. am: 99b4aebb6a
Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2076040

Change-Id: I2b276fc1165bcd66d9075566d50f0971e1447811
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-26 20:19:27 +00:00
Automerger Merge Worker
d673632679 Merge "Merge "Grant trusty to power hal" into tm-dev am: 5e9a38799a am: bf80f3cc08" into tm-d1-dev-plus-aosp am: 3cb7dddc64 am: 44de2b767b
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17927853

Change-Id: Ie2837f6688b9d82a0e10e7018ae6c737a1f450ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-26 18:41:39 +00:00
Wei Wang
84b91f8765 Merge "Grant trusty to power hal" into tm-dev am: 5e9a38799a am: dff2ecee1c am: 05f0628196 am: 9856bda336
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17927853

Change-Id: Id90168c2657cbc5d095a7a916d37bb8219acb22e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-26 18:41:22 +00:00
Wei Wang
18b9a739f1 Merge "Grant trusty to power hal" into tm-dev am: 5e9a38799a am: dff2ecee1c am: 0335b3f6bc am: a26e583d7c
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17927853

Change-Id: I990700ac5ee11a03a41db14b3cee1f839d2cd1fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-26 18:40:11 +00:00
Automerger Merge Worker
44de2b767b Merge "Merge "Grant trusty to power hal" into tm-dev am: 5e9a38799a am: bf80f3cc08" into tm-d1-dev-plus-aosp am: 3cb7dddc64
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17927853

Change-Id: I03d12de6bfdeb533692ba46089bbdaa1a5ddbb52
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-26 18:09:27 +00:00
Wei Wang
9856bda336 Merge "Grant trusty to power hal" into tm-dev am: 5e9a38799a am: dff2ecee1c am: 05f0628196
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17927853

Change-Id: I6c02397e8f46d0c495f7d5bd47e477743bde96c0
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-26 18:00:03 +00:00
Wei Wang
a26e583d7c Merge "Grant trusty to power hal" into tm-dev am: 5e9a38799a am: dff2ecee1c am: 0335b3f6bc
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17927853

Change-Id: I2e638f622cc0abfbd3b894419bcafcf4260791d4
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-26 17:59:40 +00:00
Automerger Merge Worker
3cb7dddc64 Merge "Merge "Grant trusty to power hal" into tm-dev am: 5e9a38799a am: bf80f3cc08" into tm-d1-dev-plus-aosp 2022-04-26 17:38:53 +00:00
Wei Wang
e652a35fa3 Merge "Grant trusty to power hal" into tm-dev am: 5e9a38799a am: bf80f3cc08
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17927853

Change-Id: I616b4ca914130186440e4639c441496311fec4ce
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-26 17:38:45 +00:00
Wei Wang
05f0628196 Merge "Grant trusty to power hal" into tm-dev am: 5e9a38799a am: dff2ecee1c
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17927853

Change-Id: I52b64f50174a352afb0de2215a10208a13c0f5f4
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-26 17:38:44 +00:00
Wei Wang
0335b3f6bc Merge "Grant trusty to power hal" into tm-dev am: 5e9a38799a am: dff2ecee1c
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17927853

Change-Id: I414ecceb80c9d85270e4657bf83c6ed9e23b50b7
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-26 17:38:41 +00:00
Wei Wang
df8538417f Merge "Grant trusty to power hal" into tm-dev am: 5e9a38799a am: c0ed4a78b8
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17927853

Change-Id: Ic8eacd4048c18099ace7dc93cd9a92ea167a181d
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-26 17:38:14 +00:00
Wei Wang
dff2ecee1c Merge "Grant trusty to power hal" into tm-dev am: 5e9a38799a
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17927853

Change-Id: I93b6b6da30c68efc6df038a4ba9d30e037abd8bd
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-26 17:09:57 +00:00
Wei Wang
bf80f3cc08 Merge "Grant trusty to power hal" into tm-dev am: 5e9a38799a
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17927853

Change-Id: I79cfb5eb2b9ceca77ce133466e6820a8c81477d4
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-26 17:09:24 +00:00
Wei Wang
c0ed4a78b8 Merge "Grant trusty to power hal" into tm-dev am: 5e9a38799a
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17927853

Change-Id: Ic574e1c04ce02a80576bfaccad973636f33c0c6b
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-26 17:09:16 +00:00