Commit graph

5949 commits

Author SHA1 Message Date
Xin Li
0fa2dbcfc4 [automerger skipped] Merge UQ1A.231205.015 am: 7f9f6cac0b -s ours
am skip reason: Merged-In I1263d2d55fe22d994ae8c8654b1e75ad9e4ddafe with SHA-1 1bc693d338 is already in history

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

Change-Id: I16ed09997d031be1351614aea139fc2d728452b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-08 08:21:16 +00:00
Xin Li
7f9f6cac0b Merge UQ1A.231205.015
Bug: 308969284
Merged-In: I1263d2d55fe22d994ae8c8654b1e75ad9e4ddafe
Change-Id: I7a1fec0331c5bddabd4f9edabcfda9b137f7a452
2023-12-07 15:47:12 -08:00
Herbert Xue
eb5d18f620 Remove unused Android.mk under device/google/gs101 am: 5d6726b88e am: f6b542fe4c
Original change: https://android-review.googlesource.com/c/device/google/gs101/+/2825810

Change-Id: I64f34525f3baa94d2a348ed2715f5022f18f8745
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-13 04:10:12 +00:00
Herbert Xue
cefaf4b342 Remove unused Android.mk under device/google/gs101 am: 5d6726b88e am: d5c2b9a3b5
Original change: https://android-review.googlesource.com/c/device/google/gs101/+/2825810

Change-Id: Iba255699c04607f8dad3c7ed1e9a2f897adcf914
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-13 04:07:19 +00:00
Herbert Xue
d5c2b9a3b5 Remove unused Android.mk under device/google/gs101 am: 5d6726b88e
Original change: https://android-review.googlesource.com/c/device/google/gs101/+/2825810

Change-Id: I7326f4159f637a5ea70d6cc4c58ec64ebd6628fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-13 03:20:37 +00:00
Herbert Xue
f6b542fe4c Remove unused Android.mk under device/google/gs101 am: 5d6726b88e
Original change: https://android-review.googlesource.com/c/device/google/gs101/+/2825810

Change-Id: Id79c8e62b20836185e84b4113de14a7306ac3fd5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-13 03:20:37 +00:00
Herbert Xue
5d6726b88e Remove unused Android.mk under device/google/gs101
The license declaration can't be handled in Android.bp currently.
So keep them in Android.bp.

Bug: 310058310
Test: NA
Change-Id: I3e25fa07f6b3e1bffaf585d69e342c651b50f6ef
2023-11-10 14:48:33 +08:00
Will McVicker
c5a742158e [automerger skipped] fstab: allow unlocked devices to boot with AVB test key am: df9ca7c4e1 am: b812cda10e -s ours
am skip reason: Merged-In Iee542cf5ab4973ee9cb2c1fe66d00b642fdf525b with SHA-1 662e1bc915 is already in history

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

Change-Id: Ia2839d3e016de4ee45b4323a790ad42abb48c0d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-09 03:12:47 +00:00
Will McVicker
7b8fda4678 [automerger skipped] fstab: allow unlocked devices to boot with AVB test key am: df9ca7c4e1 -s ours am: 59ceb7c081 -s ours
am skip reason: Merged-In Iee542cf5ab4973ee9cb2c1fe66d00b642fdf525b with SHA-1 662e1bc915 is already in history

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

Change-Id: I5bbe3a94b51939ec0d8050ef32292ec1fb8020ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-09 03:10:12 +00:00
Will McVicker
b812cda10e fstab: allow unlocked devices to boot with AVB test key am: df9ca7c4e1
Original change: https://android-review.googlesource.com/c/device/google/gs101/+/2819677

Change-Id: I9bfa1496b06b72c51b5b07e8d1ede70d43b43e30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-09 02:41:10 +00:00
Will McVicker
59ceb7c081 [automerger skipped] fstab: allow unlocked devices to boot with AVB test key am: df9ca7c4e1 -s ours
am skip reason: Merged-In Iee542cf5ab4973ee9cb2c1fe66d00b642fdf525b with SHA-1 662e1bc915 is already in history

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

Change-Id: Ibae31049dc107670bbc5d13bfac967ebf19c8e55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-09 02:38:25 +00:00
Will McVicker
df9ca7c4e1 fstab: allow unlocked devices to boot with AVB test key
Set `avb_keys=no_such_key` for the vendor_dlkm dynamic kernel partition
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: Iee542cf5ab4973ee9cb2c1fe66d00b642fdf525b
Merged-In: Iee542cf5ab4973ee9cb2c1fe66d00b642fdf525b
2023-11-08 19:22:45 +00:00
Will McVicker
4fa15052cf fstab: allow unlocked devices to boot with AVB test key am: 662e1bc915
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/25300777

Change-Id: Ia3c31a8e2894d75a9408e5a7afb1e71060f59cef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 05:14:30 +00:00
Will McVicker
662e1bc915 fstab: allow unlocked devices to boot with AVB test key
Set `avb_keys=no_such_key` for the vendor_dlkm dynamic kernel partition
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: Iee542cf5ab4973ee9cb2c1fe66d00b642fdf525b
2023-11-07 10:15:11 -08:00
Android Build Coastguard Worker
0a3e2b2a12 Merge cherrypicks of ['googleplex-android-review.googlesource.com/25163335'] into udc-qpr1-release.
Change-Id: I10e137f6ba5819ad76af42ab597ce4d31508bc14
2023-10-27 03:36:05 +00:00
Paul Lawrence
9f697c42f5 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:1bc693d338e8d26307d51bb6731d8e94f1df33f9)
Merged-In: I1263d2d55fe22d994ae8c8654b1e75ad9e4ddafe
Change-Id: I1263d2d55fe22d994ae8c8654b1e75ad9e4ddafe
2023-10-27 03:31:52 +00:00
Paul Lawrence
3b9ccc0113 Run fsck to resolve possible data corruption am: 1bc693d338 am: 0087b3ac91 am: 0a23de535b
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/25163335

Change-Id: I6d237977f61d60f22ede8c6d3d96596e1cb14645
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 20:31:18 +00:00
Paul Lawrence
0a23de535b Run fsck to resolve possible data corruption am: 1bc693d338 am: 0087b3ac91
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/25163335

Change-Id: I6015b2592388b6bc6f70d2dd2e90aa5efe7264b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 20:07:13 +00:00
Paul Lawrence
0087b3ac91 Run fsck to resolve possible data corruption am: 1bc693d338
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/25163335

Change-Id: I10f771c44574ce4e334ee7a3ecb7850afc083ffd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 19:34:15 +00:00
Paul Lawrence
6fbd2d1b10 Run fsck to resolve possible data corruption am: 1bc693d338 am: 23de3dd575
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/25163335

Change-Id: Ieca1604f9190a93c74994170f6a44863d5747391
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 19:34:04 +00:00
Paul Lawrence
23de3dd575 Run fsck to resolve possible data corruption am: 1bc693d338
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/25163335

Change-Id: Id1c1c5fa2d393c5ed003760fb4ca627b930b16b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 19:31:44 +00:00
Paul Lawrence
1bc693d338 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-24 07:59:40 -07:00
Xin Li
82f78d8789 [automerger skipped] Merge 10952656 am: 6249b6ee2f -s ours
am skip reason: Merged-In Id486c53997b232c2b02d18d1c7a6d773f1319110 with SHA-1 9c567b3d76 is already in history

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

Change-Id: I07d10a881256453bb4a8f420ae5dfdc1fd49b7af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-19 18:48:19 +00:00
Xin Li
6249b6ee2f Merge 10952656
Merged-In: Id486c53997b232c2b02d18d1c7a6d773f1319110
Change-Id: I3d2dbaf2421c7f32c5088839e9e7440f2b7d7128
2023-10-17 10:06:29 -07:00
Xin Li
9c567b3d76 [automerger skipped] Merge Android 14 am: 97c0d04d87 -s ours am: 2218cc84a9 -s ours am: 63b5b3a490 -s ours am: 43e5e5ff3e -s ours
am skip reason: Merged-In Ib4ec351fd5f2d59d161578440e8c0d36f8b68a6f with SHA-1 c6b5b5990a is already in history

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

Change-Id: Id486c53997b232c2b02d18d1c7a6d773f1319110
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 11:01:16 +00:00
Xin Li
43e5e5ff3e [automerger skipped] Merge Android 14 am: 97c0d04d87 -s ours am: 2218cc84a9 -s ours am: 63b5b3a490 -s ours
am skip reason: Merged-In Ib4ec351fd5f2d59d161578440e8c0d36f8b68a6f with SHA-1 c6b5b5990a is already in history

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

Change-Id: I8f0576cf46996c9ff8d02cf69b0c05345e26de64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 09:51:25 +00:00
Xin Li
63b5b3a490 [automerger skipped] Merge Android 14 am: 97c0d04d87 -s ours am: 2218cc84a9 -s ours
am skip reason: Merged-In Ib4ec351fd5f2d59d161578440e8c0d36f8b68a6f with SHA-1 c6b5b5990a is already in history

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

Change-Id: I1b75b5a02f0f999fd15d601fa4932b0c9f50ca8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 08:59:44 +00:00
Xin Li
2218cc84a9 [automerger skipped] Merge Android 14 am: 97c0d04d87 -s ours
am skip reason: Merged-In Ib4ec351fd5f2d59d161578440e8c0d36f8b68a6f with SHA-1 c6b5b5990a is already in history

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

Change-Id: I51a81140c8882e60540742f189eb9edabd51cc62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 07:52:45 +00:00
Xin Li
97c0d04d87 Merge Android 14
Bug: 298295554
Merged-In: Ib4ec351fd5f2d59d161578440e8c0d36f8b68a6f
Change-Id: Ib3de89cedb3c241aec9a8b4474663ea73566920a
2023-10-05 15:33:36 -07:00
Android Build Coastguard Worker
9652836b87 Snap for 10865315 from 36c9c135fd to udc-qpr1-release
Change-Id: I2189a822ad56f4ad3d2d67b68d927718075a51b4
2023-09-26 23:02:34 +00:00
Ian Elliott
cbb7eda2fb Revert "gs101: Enable SkiaVk as RenderEngine backend" am: 36c9c135fd
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/24866271

Change-Id: I39c49cc34c10660f00bd5a83b90fd00b01cdc24f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-26 18:18:51 +00:00
Ian Elliott
36c9c135fd Revert "gs101: Enable SkiaVk as RenderEngine backend"
This reverts commit b8a0da464b.

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

Bug: 301846142
Bug: 298975477
Change-Id: I8aa4f335cd61ef2800238424aeac2cedd6dcfb67
2023-09-26 17:40:39 +00:00
Android Build Coastguard Worker
91271d168f Snap for 10850711 from 9d936fe835 to udc-qpr1-release
Change-Id: I00322df3e43794a240b81149ddcd402f9468694e
2023-09-23 01:07:01 +00:00
Avichal Rakesh
7ba090036c usb.rc: Advertise 360p and 480p support through UVC am: 9d936fe835
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/24806969

Change-Id: I83a8e6fea3d254c4d2f746fb348cf76249391f47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-22 17:13:34 +00:00
Avichal Rakesh
9d936fe835 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: I78e9f97575784996aac94e576c7f23b0874a8d09
2023-09-21 21:00:10 -07:00
Android Build Coastguard Worker
f0a4074821 Snap for 10844344 from b6dd753059 to udc-qpr1-release
Change-Id: I8ae6ed469985f1c4dd7d8c13fbd766c64202f168
2023-09-21 23:02:25 +00:00
Kuen-Han Tsai
46915051db Usb.cpp: Fix typos when unable to disable USB data am: b6dd753059
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/24797931

Change-Id: I7c224ca968c3d8e1e386e6248e1730c934d00717
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
b6dd753059 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: I0c5b7c4dc5bfe21ba17058536b5014eb5d69d1f3
2023-09-21 09:54:59 +00:00
Klines Jiang
f71cd944e8 [SELinux] Add gyotaku_app doamin to Pixel 2020. am: cd3ffcdd70
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/24742248

Change-Id: I7411fa57385f2d7b97c2b58fc9fc51447454e448
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-21 06:06:42 +00:00
Android Build Coastguard Worker
963164dedc Snap for 10838116 from ed622856fc to udc-qpr1-release
Change-Id: I4e896b86c55faac93b05a9c67909d83f89cced4a
2023-09-20 23:03:02 +00:00
Klines Jiang
cd3ffcdd70 [SELinux] Add gyotaku_app doamin to Pixel 2020.
Bug: 296836878

Test: Local build and tested pass.

Change-Id: I3c4e63fb73ea233838a5ea777a340310a18186ed
Merged-In: I3c4e63fb73ea233838a5ea777a340310a18186ed
2023-09-20 18:04:47 +00:00
Amit Sunil Dhamne
00a104bf12 UsbGadget: Update SDP enum timeout when gadget is pulled up am: ed622856fc
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/24805164

Change-Id: If492405e72cff6101bbaa861da0b059753e16552
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-20 17:38:12 +00:00
Amit Sunil Dhamne
d7c18dc1e9 usb: Modify sdp enumeration timeout value in charger mode am: b2232b52bb
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/24805554

Change-Id: Idd31c8ac12e8c5a4a229f232a1b3874fff4a680c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-20 17:37:40 +00:00
Amit Sunil Dhamne
ed622856fc UsbGadget: Update SDP enum timeout when gadget is pulled up
Indicate to the kernel that the usb gadget is pulled up
by writing to `update_sdp_enum_timeout` sysfs node. Write
to this node will inform the kernel that it can lower the SDP
timeout alarm value which is used to detect an SDP port
vs a DCP.

ported from c5c5b127a7ed0db559d286284fe77b656bef6945

Bug: 275687235
Test: Check `update_sdp_enum_timeout` is written into after usb
      gadget is pulled up. Verify that the alarm timeout lowers.
Change-Id: Id3ae7e7a20b236cec6604414a7f81860e868bdd0
Signed-off-by: Amit Sunil Dhamne <amitsd@google.com>
2023-09-20 16:24:59 +00:00
Android Build Coastguard Worker
1be5896791 Snap for 10832001 from 305dccf733 to udc-qpr1-release
Change-Id: I3d26f3e35bb44eb8a851e4a1fdc4e61916fadf5a
2023-09-19 23:03:00 +00:00
Amit Sunil Dhamne
b2232b52bb usb: Modify sdp enumeration timeout value in charger mode
Write to /sys/class/typec/port<...>/device/update_sdp_enum_timeout
to reduce SDP enumeration timeout value when device is in charger
mode. This will enable faster detection of a DCP port.

ported from 6710e31a629f81cf308e1099f75a01c82db6d006

Test: Validate (in charger mode) that the sysfs attribute is 1
      (meaning lower sdp timeout value is being used). Read dmesg to
      see print showing timeout value is 5000ms.
Bug: 275687235
Change-Id: I1bc872911d7f1eab26e62fe6f12fba05608e0f83
Signed-off-by: Amit Sunil Dhamne <amitsd@google.com>
2023-09-19 14:01:34 -07:00
Qais Yousef
b80fe17ecd init.gs101.rc: Disable util-awareness am: 305dccf733
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/24720138

Change-Id: Id7877d3121f10c8362dd2753ed737aad68915166
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19 18:37:57 +00:00
Qais Yousef
305dccf733 init.gs101.rc: Disable util-awareness
There are some regression reports. Disable them completely for now.

Bug: 297496375
Change-Id: I2a2b4d13366d3173c441e8ccad456a67ddd3a16b
Signed-off-by: Qais Yousef <qyousef@google.com>
2023-09-19 17:46:01 +00:00
Wilson Wu
29d260eedb Disable variable refresh rate when typing on gs101 am: b6c4eba975
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/24798331

Change-Id: I79d8c74ec758b054529d26ef04e19e6fbb5d152a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19 10:37:02 +00:00
Wilson Wu
b6c4eba975 Disable variable refresh rate when typing on gs101
Turn off config_variableRefreshRateTypingSupported on gs101.

Bug: 299966467
Test: presubmit
Change-Id: Ifcac7ffe451db1b5059fb8827be58c80be828178
2023-09-19 09:22:02 +00:00