Commit graph

4185 commits

Author SHA1 Message Date
Sandeep Dhavale
c4c2921aad Update health AIDL HAL to V3 am: 7bdd0af481 am: cc462adf40
Original change: https://android-review.googlesource.com/c/device/google/gs201/+/2882026

Change-Id: Ia736dc5ff4339bc96c2f6f0d60465529b688af20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-19 09:17:36 +00:00
Sandeep Dhavale
cc462adf40 Update health AIDL HAL to V3 am: 7bdd0af481
Original change: https://android-review.googlesource.com/c/device/google/gs201/+/2882026

Change-Id: I078b2af55d78f2fc7e3421b5299146fd4e8f2d92
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-19 08:47:14 +00:00
Sandeep Dhavale
7bdd0af481 Update health AIDL HAL to V3
Bug: 316837586
Test: TH
Test: vts-tradefed run vts -m vts_treble_vintf_vendor_test
Change-Id: Ib4b240cd28df174257105db5bf6eae6accfae26a
Signed-off-by: Sandeep Dhavale <dhavale@google.com>
2023-12-18 23:36:44 -08:00
Hungyen Weng
26e7f60254 config: Use carrier config in ROM by default am: 8dbc173f2b
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/25616534

Change-Id: Icb4bdc42888cbd41d71387574affabc6607f4745
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-12 05:10:55 +00:00
Xin Li
31e614038a [automerger skipped] Merge Android 14 QPR1 am: d815a6775f -s ours am: d372ef70ff -s ours
am skip reason: Merged-In I484f4446b915cad1347dd065f2539cc12c75beec with SHA-1 e8cf7e19a1 is already in history

Original change: https://android-review.googlesource.com/c/device/google/gs201/+/2863573

Change-Id: I2b868ab3e8999174c3415cb28f2ad7a72f0729b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11 22:02:41 +00:00
Xin Li
d372ef70ff [automerger skipped] Merge Android 14 QPR1 am: d815a6775f -s ours
am skip reason: Merged-In I484f4446b915cad1347dd065f2539cc12c75beec with SHA-1 e8cf7e19a1 is already in history

Original change: https://android-review.googlesource.com/c/device/google/gs201/+/2863573

Change-Id: I0a0102fc588322a247feaa366a600807de6f8aac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11 21:16:51 +00:00
Hungyen Weng
8dbc173f2b config: Use carrier config in ROM by default
Bug: 314890118

Test: Flash ROM and confirm the carrier config follows the ROM.
Change-Id: Id0407802e2027397ca7a409345c51273b75079e7
2023-12-11 11:23:16 -08:00
Xin Li
d815a6775f Merge Android 14 QPR1
Merged-In: I484f4446b915cad1347dd065f2539cc12c75beec
Bug: 315507370
Change-Id: Ib3fcff289774f28e147fe39738f3cf9908a571e4
2023-12-08 13:13:24 -08:00
Xin Li
351907775f [automerger skipped] Merge UQ1A.231205.015 am: e8cf7e19a1 -s ours
am skip reason: Merged-In I1263d2d55fe22d994ae8c8654b1e75ad9e4ddafe with SHA-1 e4a81c0e8f is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/25590758

Change-Id: I7025d5c373402976626128aa08909c7d0620e95e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-08 08:21:17 +00:00
Xin Li
e8cf7e19a1 Merge UQ1A.231205.015
Bug: 308969284
Merged-In: I1263d2d55fe22d994ae8c8654b1e75ad9e4ddafe
Change-Id: I484f4446b915cad1347dd065f2539cc12c75beec
2023-12-07 15:47:12 -08:00
Treehugger Robot
d1a0918a6c Merge "Remove unused Android.mk under device/google/gs201" into main am: e23a8f2638 am: 5231856db3
Original change: https://android-review.googlesource.com/c/device/google/gs201/+/2823753

Change-Id: I0f501870a7209328402372313ff0d3d710f663b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-10 07:13:36 +00:00
Treehugger Robot
32b82b2c30 Merge "Remove unused Android.mk under device/google/gs201" into main am: e23a8f2638 am: fa5e418afe
Original change: https://android-review.googlesource.com/c/device/google/gs201/+/2823753

Change-Id: I0660fa5f3c01d9e1c1029d573c897d2c67cdc739
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-10 07:11:44 +00:00
Treehugger Robot
fa5e418afe Merge "Remove unused Android.mk under device/google/gs201" into main am: e23a8f2638
Original change: https://android-review.googlesource.com/c/device/google/gs201/+/2823753

Change-Id: Ib4470a2985734a7e8dde2e808f2993816806713a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-10 06:23:35 +00:00
Treehugger Robot
5231856db3 Merge "Remove unused Android.mk under device/google/gs201" into main am: e23a8f2638
Original change: https://android-review.googlesource.com/c/device/google/gs201/+/2823753

Change-Id: I83666f34043f62cc3c008f233219106a5e83787e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-10 06:23:35 +00:00
Treehugger Robot
e23a8f2638 Merge "Remove unused Android.mk under device/google/gs201" into main 2023-11-10 05:55:52 +00:00
Will McVicker
b7e64e1a9c [automerger skipped] fstab: allow unlocked devices to boot with AVB test key am: 47ca5891c8 am: d0927073f6 -s ours
am skip reason: Merged-In I11edf6e50411a05c6723f7523f3672a9a8116d7a with SHA-1 a9ba6b344f is already in history

Original change: https://android-review.googlesource.com/c/device/google/gs201/+/2794142

Change-Id: Ia010473ea85fa3e68e402ef8a5bc2ab1dc2de9fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-09 18:53:16 +00:00
Will McVicker
0336b944d1 [automerger skipped] fstab: allow unlocked devices to boot with AVB test key am: 47ca5891c8 -s ours am: e877784aa7 -s ours
am skip reason: Merged-In I11edf6e50411a05c6723f7523f3672a9a8116d7a with SHA-1 a9ba6b344f is already in history

Original change: https://android-review.googlesource.com/c/device/google/gs201/+/2794142

Change-Id: I2be8c638af351e60a54ed22d915f1bf81b681ce9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-09 18:50:20 +00:00
Will McVicker
d0927073f6 fstab: allow unlocked devices to boot with AVB test key am: 47ca5891c8
Original change: https://android-review.googlesource.com/c/device/google/gs201/+/2794142

Change-Id: I96995e86bb8e32b3ef5632709dee2c572d19aa9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-09 17:43:49 +00:00
Will McVicker
e877784aa7 [automerger skipped] fstab: allow unlocked devices to boot with AVB test key am: 47ca5891c8 -s ours
am skip reason: Merged-In I11edf6e50411a05c6723f7523f3672a9a8116d7a with SHA-1 a9ba6b344f is already in history

Original change: https://android-review.googlesource.com/c/device/google/gs201/+/2794142

Change-Id: I2cc67b57702ee6289bf055be54b0aceadd665d6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-09 17:40:59 +00:00
Herbert Xue
ce1e182fab Remove unused Android.mk under device/google/gs201
Remove these two Android.mk that is no longer used.

Bug: 309921036
Test: NA
Change-Id: Ib8703a3ace3eed7b13f4b851dc0eb2aef1d70c55
2023-11-09 18:56:29 +08:00
Will McVicker
47ca5891c8 fstab: allow unlocked devices to boot with AVB test key
Set `avb_keys=no_such_key` for dynamic kernel partitions to allow booting
unlocked devices with a custom kernel. This allows a few things:

1) Dogfooders can flash a custom kernel without wiping their device.
   This can help developers track down hard-to-reproduce bugs without
   rolling out a patch to the whole dogfooder population.
2) Developers can uprev their device's kernel without wiping their
   device or packaging the kernel with an Android platform build.

Note: we are using "no_such_key" to ensure an AVB keys file doesn't
accidentally get created.

Test: Flash CI build. Then flash custom kernel on top.
Bug: 274825778
Change-Id: I11edf6e50411a05c6723f7523f3672a9a8116d7a
Merged-In: I11edf6e50411a05c6723f7523f3672a9a8116d7a
2023-11-08 19:22:01 +00:00
Will McVicker
eac65ae6df fstab: allow unlocked devices to boot with AVB test key am: a9ba6b344f
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/25300418

Change-Id: Ia9ce83dd6084b4ef1cbc021b8e26655ffa501ff7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 09:29:18 +00:00
Will McVicker
a9ba6b344f fstab: allow unlocked devices to boot with AVB test key
Set `avb_keys=no_such_key` for dynamic kernel partitions to allow booting
unlocked devices with a custom kernel. This allows a few things:

1) Dogfooders can flash a custom kernel without wiping their device.
   This can help developers track down hard-to-reproduce bugs without
   rolling out a patch to the whole dogfooder population.
2) Developers can uprev their device's kernel without wiping their
   device or packaging the kernel with an Android platform build.

Note: we are using "no_such_key" to ensure an AVB keys file doesn't
accidentally get created.

Test: Flash CI build. Then flash custom kernel on top.
Bug: 274825778
Change-Id: I11edf6e50411a05c6723f7523f3672a9a8116d7a
2023-11-07 09:58:35 -08:00
Android Build Coastguard Worker
80d7e99173 Merge cherrypicks of ['googleplex-android-review.googlesource.com/25159378'] into udc-qpr1-release.
Change-Id: I85f3aed1536fcb97785f040aca47e3f837165850
2023-10-27 03:36:07 +00:00
Paul Lawrence
fbfc56b8aa Run fsck to resolve possible data corruption
Trigger fsck on mount of /data if the value of ro.preventative_fsck is
not equal to the contents of /metadata/vold/preventative_fsck, then set
the file to the property to prevent future runs

See b/305658663 for context

Bug: 305658663
Test: Make sure fsck run after first boot and not after second
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:e4a81c0e8f9f8d89f0e42e8fd7ec40cec6b887ed)
Merged-In: I1263d2d55fe22d994ae8c8654b1e75ad9e4ddafe
Change-Id: I1263d2d55fe22d994ae8c8654b1e75ad9e4ddafe
2023-10-27 03:32:02 +00:00
Paul Lawrence
b182dc0c50 Run fsck to resolve possible data corruption am: e4a81c0e8f am: 5af53f9a60 am: 288ad23091
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/25159378

Change-Id: I8c6497260856f4789ba6138323c2792665920e62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 20:31:19 +00:00
Paul Lawrence
288ad23091 Run fsck to resolve possible data corruption am: e4a81c0e8f am: 5af53f9a60
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/25159378

Change-Id: If7eb853cdfc35f00225629365bb202521cf62406
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 20:07:14 +00:00
Paul Lawrence
5af53f9a60 Run fsck to resolve possible data corruption am: e4a81c0e8f
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/25159378

Change-Id: Ib529340822a9fc0386dc4c2a33885a2bf40d1f54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 19:34:15 +00:00
Paul Lawrence
9e3d13100b Run fsck to resolve possible data corruption am: e4a81c0e8f am: 2d512d7bf9
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/25159378

Change-Id: Icad12c75255fd9e4e4c0f8b7721597fcbf695b4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 19:34:05 +00:00
Paul Lawrence
2d512d7bf9 Run fsck to resolve possible data corruption am: e4a81c0e8f
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/25159378

Change-Id: If504cd1fcf3828ed48aef14336a6262a9490d43f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 19:31:44 +00:00
Paul Lawrence
e4a81c0e8f Run fsck to resolve possible data corruption
Trigger fsck on mount of /data if the value of ro.preventative_fsck is
not equal to the contents of /metadata/vold/preventative_fsck, then set
the file to the property to prevent future runs

See b/305658663 for context

Bug: 305658663
Test: Make sure fsck run after first boot and not after second
Change-Id: I1263d2d55fe22d994ae8c8654b1e75ad9e4ddafe
2023-10-26 01:00:50 +00:00
Xin Li
52021a3379 [automerger skipped] Merge 10952656 am: 3e1b44b391 -s ours
am skip reason: Merged-In Iaf4ad9cdd9f6b2127547d2c116f966413011009b with SHA-1 c04e26a280 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/25089448

Change-Id: Ib0255f9b4dd1c648e3384071343f25219823d64e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-19 18:48:08 +00:00
Xin Li
3e1b44b391 Merge 10952656
Merged-In: Iaf4ad9cdd9f6b2127547d2c116f966413011009b
Change-Id: I9dbfd58b177653ad8bf2e7bba4e1ac4f719be1c6
2023-10-17 10:06:29 -07:00
Xin Li
c04e26a280 [automerger skipped] Merge Android 14 am: 9cce39b482 -s ours am: 30817a576a -s ours am: c8a8b0a6f7 -s ours am: 2c97fadac6 -s ours
am skip reason: Merged-In I6f85889399c989a9a65ab7e7178fd02f89e7847f with SHA-1 91a692dae3 is already in history

Original change: https://android-review.googlesource.com/c/device/google/gs201/+/2777021

Change-Id: Iaf4ad9cdd9f6b2127547d2c116f966413011009b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 11:01:05 +00:00
Xin Li
2c97fadac6 [automerger skipped] Merge Android 14 am: 9cce39b482 -s ours am: 30817a576a -s ours am: c8a8b0a6f7 -s ours
am skip reason: Merged-In I6f85889399c989a9a65ab7e7178fd02f89e7847f with SHA-1 91a692dae3 is already in history

Original change: https://android-review.googlesource.com/c/device/google/gs201/+/2777021

Change-Id: I942a135279b6108d56f5b471649d51a8ad46273e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 09:51:15 +00:00
Xin Li
c8a8b0a6f7 [automerger skipped] Merge Android 14 am: 9cce39b482 -s ours am: 30817a576a -s ours
am skip reason: Merged-In I6f85889399c989a9a65ab7e7178fd02f89e7847f with SHA-1 91a692dae3 is already in history

Original change: https://android-review.googlesource.com/c/device/google/gs201/+/2777021

Change-Id: I7c7af286c7b76518930fcd7266f4454da74ea735
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 08:59:35 +00:00
Xin Li
30817a576a [automerger skipped] Merge Android 14 am: 9cce39b482 -s ours
am skip reason: Merged-In I6f85889399c989a9a65ab7e7178fd02f89e7847f with SHA-1 91a692dae3 is already in history

Original change: https://android-review.googlesource.com/c/device/google/gs201/+/2777021

Change-Id: I3eda5ba99136a9727bd622eedb88c5bf48982e97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 07:52:34 +00:00
Xin Li
9cce39b482 Merge Android 14
Bug: 298295554
Merged-In: I6f85889399c989a9a65ab7e7178fd02f89e7847f
Change-Id: Iba298169eab2a1765b463753769afdc52a3d8c92
2023-10-05 16:24:22 -07:00
Android Build Coastguard Worker
2097946299 Snap for 10865315 from ac76fcf025 to udc-qpr1-release
Change-Id: I1ccf0f7464ea39906a2a70df04e458f59a5f3800
2023-09-26 23:02:36 +00:00
Ian Elliott
8aa21312f5 Revert "gs201: Enable SkiaVk as RenderEngine backend" am: ac76fcf025
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/24864821

Change-Id: I75ee999893328ad08b0921fdb6d1194995092913
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-26 18:19:03 +00:00
Ian Elliott
ac76fcf025 Revert "gs201: Enable SkiaVk as RenderEngine backend"
This reverts commit db1a72ccdb.

Reason for revert: Increased jank reported, especially on the Pixel tablet

Bug: 301846142
Bug: 298975477
Change-Id: I81726fdd164b48dc72756e35e4dadd755909cb91
2023-09-26 17:41:07 +00:00
Android Build Coastguard Worker
defac5849b Snap for 10850711 from cd00df2aeb to udc-qpr1-release
Change-Id: I80c827da0b160dcc3344de84b7c077b6f828f47b
2023-09-23 01:07:03 +00:00
Avichal Rakesh
bad05cd4d1 usb.rc: Advertise 360p and 480p support through UVC am: cd00df2aeb
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/24804762

Change-Id: I6451d761b9a13af6c049551855f30448d798ad73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-22 17:14:07 +00:00
Avichal Rakesh
cd00df2aeb usb.rc: Advertise 360p and 480p support through UVC
Many host applications expect and ask for lower resolution streams when
streaming from a USB webcam. To support those applications, this CL
adds support for 640x480 and 640x360 streams.

Bug: 301170431
Test: Manually tested that the resolution is advertised and streamed.
Change-Id: I0bb6e2073554de4e5ce8fe472dae6a77e69aeb54
2023-09-21 21:00:21 -07:00
Android Build Coastguard Worker
868046d0a0 Snap for 10844344 from f233bec505 to udc-qpr1-release
Change-Id: I3fc1a7a34428da81d46ae558b75231fb505b20fa
2023-09-21 23:02:27 +00:00
Kuen-Han Tsai
503f92156e Usb.cpp: Fix typos when unable to disable USB data am: f233bec505
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/24792093

Change-Id: I0c93426f0162a87935c6e1a94dc4b3598edf8a59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-21 10:34:30 +00:00
Kuen-Han Tsai
f233bec505 Usb.cpp: Fix typos when unable to disable USB data
If Usb.cpp cannot write a zero value to the USB_DATA_PATH file, display
the message of "Not able to turn off usb connection notification".

Test: refactoring CL. Existing tests still pass.
Bug: 301016122
Change-Id: I8e0f485e74d10a0154e4cd78af9f5ef5a22d328f
2023-09-21 09:54:59 +00:00
Klines Jiang
b334db6588 [SELinux] Add gyotaku_app doamin to Pixel 2022. am: 45b53c05d0
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/24741373

Change-Id: I28655c5758c84b002de6d5bc5dc5fe0d69322bc8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-21 05:14:22 +00:00
Android Build Coastguard Worker
b5d44d4fce Snap for 10838116 from d8e2a02998 to udc-qpr1-release
Change-Id: Ib3219fbb645a6bc8311bd4a546f47399d43d6078
2023-09-20 23:03:03 +00:00
Klines Jiang
45b53c05d0 [SELinux] Add gyotaku_app doamin to Pixel 2022.
Bug: 296836878

Test: Local build and tested pass.
Change-Id: I39a8aea20281f83f90657306b8de0233054cb60a
Merged-In: I39a8aea20281f83f90657306b8de0233054cb60a
2023-09-20 18:03:39 +00:00