Commit graph

6325 commits

Author SHA1 Message Date
mincheli
2d1201d13a gs101 includes TTS voice packs from gs-common/device.mk
And it removes the duplicated voice packs in gs101/tts

Bug: 140145973
Test: manual test
Change-Id: Id6cdf33e7670120e9e1f7cc39ecc9ff620fa8c9a
2023-10-31 06:17:07 +00:00
Will Song
d489eba3dc PREUPLOAD: Enforce jsonlint in preupload
Checks syntax and simple brace balances for all JSON files.

Test: Edit any json file and try upload
Bug: 127794899
Change-Id: I70ad38f73a4fea908442b4411e3aa7ffbaeb7d88
2023-10-29 05:49:27 +00:00
Paul Lawrence
f4f8ef741b Run fsck to resolve possible data corruption am: 1bc693d338 am: 0087b3ac91 am: 0a23de535b am: 3b9ccc0113
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/25163335

Change-Id: I95a9fed08d96324945d975db084cb373b05663cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 21:00:19 +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
40a8cf67b7 Run fsck to resolve possible data corruption am: 1bc693d338 am: c566385df7
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/25163335

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

Change-Id: Ibb24125afe25cc4acb9d9bbd1380e9217f3b6e2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 20:04:10 +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
c566385df7 Run fsck to resolve possible data corruption am: 1bc693d338
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/25163335

Change-Id: I0239a06c331576b78b2437b804e30e2ec78d07ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 19:32:24 +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
Jenny Ho
235d2894de pixelstats: add gmsr path
Bug: 300590097
Change-Id: I189cbbea37b621d7f17231413f8667edbbfc27e4
Signed-off-by: Jenny Ho <hsiufangho@google.com>
2023-10-25 15:15:23 +08: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
Leo Chen
22a0524609 Update IDisplay to V10
Test: Build pass
Bug: 299410182
Change-Id: I8726938c8bcb10bc4da6415446916bedad143c9f
Signed-off-by: Leo Chen <yinchiuan@google.com>
2023-10-24 02:40:44 +00:00
Xin Li
2c82b1ccfe [automerger skipped] Merge 10952656 am: 6249b6ee2f -s ours am: 82f78d8789 -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: I1f043924d2bf3af64d36ad88fb8fe6db8abe728a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-19 23:55:04 +00: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
Bruno BELANYI
4a8b8ace61 Enable HDR shader priming in SurfaceFlinger
Bug: 295257834
Test: manual - check that HDR shaders are generated after applying
Change-Id: I62cb104914d41f7402e80c83598006a6a018be27
2023-10-18 12:44:02 +00:00
Xin Li
6249b6ee2f Merge 10952656
Merged-In: Id486c53997b232c2b02d18d1c7a6d773f1319110
Change-Id: I3d2dbaf2421c7f32c5088839e9e7440f2b7d7128
2023-10-17 10:06:29 -07:00
Jasmine Cha
88ae21dc60 audio: fix typo
Bug: 305838207
Test: build pass/ recording runtime tuning

Change-Id: I34f3611cb8c75adc8f72bb3ba126472cfd9293f2
Signed-off-by: Jasmine Cha <chajasmine@google.com>
2023-10-17 15:10:42 +08:00
guibing
e9d930291a init: gs101: update vendor_sched procfs paths
Vendor sched procfs path hierarchy gets updated in kernel.
Update the paths in init rc file and task profiles to match the change.

Bug: 289151587
Test: UIbench ab test
Change-Id: I6f8aa26587578860483d6ededf88e9c04a926644
2023-10-13 17:19:09 +00:00
Minchan Kim
402f9f3f88 gs101: change swap_free_low_percentage to 10
Since LMKD introduced aggressive kill for cached apps, we can change the
swap_free_low_percentage back to 10.

Bug: 300660611
Change-Id: Ib570d579e0d3addee242b226aed72a3a138a0f78
Signed-off-by: Minchan Kim <minchan@google.com>
2023-10-11 20:50:27 -07:00
Xin Li
f22905a1b0 [automerger skipped] Merge Android 14 am: 97c0d04d87 -s ours am: 2218cc84a9 -s ours am: 63b5b3a490 -s ours am: 43e5e5ff3e -s ours am: 9c567b3d76 -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: I6fbdc86dd4d90a5c09760cecd45473caa8ee3359
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-07 00:20:46 +00: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
Roy Luo
653f31663d Usb: capture and upload Suez metric VendorUsbDataSessionEvent
Upload metrics for the last data session that just ends upon
data role changes. The change is purely metric collection and
does not change any business logic.
This is a direct CP from ag/24816727

Bug: 297224564
Test: Trigger metric upload for both host and device mode and
      verify it by statsd_testdrive
Change-Id: I823ae8712b7914cfc7f6c6379acb3749d13c0974
(cherry picked from commit ccb35c81ff0bbfb013136bae7a572280b196bd1a)
2023-10-05 23:49:40 +00:00
Xin Li
97c0d04d87 Merge Android 14
Bug: 298295554
Merged-In: Ib4ec351fd5f2d59d161578440e8c0d36f8b68a6f
Change-Id: Ib3de89cedb3c241aec9a8b4474663ea73566920a
2023-10-05 15:33:36 -07:00
Arthur Hung
2685ea8e57 Add default allow list for VRR small dirty detection
The feature will be enabled by the feature flag

Bug: 283055450
Test: Build
Change-Id: Ia51f69f8b68b0dd74bd454c73a4d6d715f1d658c
2023-10-04 08:06:14 +00:00
Roy Luo
bf5ca96192 usb: upgrade stats AIDL to v2
Upgrade stats AIDL to v2 following pixelstats lib.

Bug: 297224564
Test: Build
Change-Id: I3b68c8ed3ff7ff96c185c8f990b03acabb64e3ad
2023-10-03 20:49:32 +00:00
Will McVicker
b54d8f91e3 usb: Update Usb and UsbGadget i2c logic
Update the logic to find the i2c bus number to use either the named i2c
devices or the static i2c bus numbers. This allows us to support both
cases -- v5.10 uses i2c-<devname> while v6.1 uses <i2c-bus#>-<reg>.

Bug: 291606723
Test: verify no errors from the usb services with v5.10 and v6.1
Change-Id: I6d41ac041ead68e72a3766e03d491bcd478468d3
2023-10-02 16:28:59 +00:00
Will McVicker
b1662cade2 init: update i2c bus numbers and move initialization to ueventd
Update the i2c bus numbers to use the statically assigned numbers
configured in the kernel device tree. In addition, use ueventd to set
the ACL for the i2c devices.

Bug: 291606723
Test: performance boot testing
Test: verify selinux labelling with ls -Z on the modified device nodes
Change-Id: Ib412510e4b6c086c978ad5487486323685732cae
2023-10-02 16:28:59 +00:00
Midas Chien
184fc05293 display: allow hwcomposer to access DRM module debug file
Change the owner and group of the DRM module debug file to system to
grant permission for hwcomposer.

Bug: 301599195
Test: check HWC can access it
Change-Id: I76cb73cf9149347d486354abf8c9fc7d165e1bea
2023-10-02 01:52:28 +00:00
Roy Luo
7bd4fdd98f Revert "init: update i2c bus numbers and move initialization to ..."
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: I1c87ea91d0a2eaf441c554b8f4729cefd0eca068
BUG: 302549624
2023-09-28 18:00:06 +00:00
Roy Luo
dae6f56edd Revert "usb: Update Usb and UsbGadget i2c logic"
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: I63de07348d45bd1a75e73da01f8ee402982cac30
BUG: 302549624
2023-09-28 18:00:07 +00:00
Will McVicker
901548943c usb: Update Usb and UsbGadget i2c logic
Update the logic to find the i2c bus number to use either the named i2c
devices or the static i2c bus numbers. This allows us to support both
cases -- v5.10 uses i2c-<devname> while v6.1 uses <i2c-bus#>-<reg>.

Bug: 291606723
Test: verify no errors from the usb services with v5.10 and v6.1
Change-Id: Ia68c424a3b6579457be6cfd0d07788e9da44a86e
2023-09-28 16:08:00 +00:00
Will McVicker
d9c462fc17 init: update i2c bus numbers and move initialization to ueventd
Update the i2c bus numbers to use the statically assigned numbers
configured in the kernel device tree. In addition, use ueventd to set
the ACL for the i2c devices.

Bug: 291606723
Test: performance boot testing
Test: verify selinux labelling with ls -Z on the modified device nodes
Change-Id: I579143fa38bc2e9b3bf7dc618b10e63001263e2e
2023-09-28 16:08:00 +00:00
Maciej Żenczykowski
035130fee8 OWNERS: master -> main
Change-Id: Ib8ee84d878c270631e12dd02c8d5ec1eedbd1839
2023-09-28 00:30:02 +00:00
Ian Elliott
d5f81e1ce8 Revert "gs101: Enable SkiaVk as RenderEngine backend" am: 36c9c135fd am: cbb7eda2fb
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/24866271

Change-Id: Ia866558f36426477768058ba393ef11e91002b22
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-26 19:16:30 +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
Avichal Rakesh
19d740a6f4 usb.rc: Advertise 360p and 480p support through UVC am: 9d936fe835 am: 7ba090036c
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/24806969

Change-Id: Iae650a5c84e266f0a41945aaf5955ae02f9d5bc9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-22 18:11:04 +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
Kuen-Han Tsai
0c36feb52e Usb.cpp: Fix typos when unable to disable USB data am: b6dd753059 am: 46915051db
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/24797931

Change-Id: I4a7d6a96cde3e3fb14d9464c82326b8dc222e459
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-21 11:31:00 +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
0e93cb704a [automerger skipped] [SELinux] Add gyotaku_app doamin to Pixel 2020. am: cd3ffcdd70 am: f71cd944e8 -s ours
am skip reason: Merged-In I3c4e63fb73ea233838a5ea777a340310a18186ed with SHA-1 5c815914ae is already in history

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

Change-Id: Ie4ad4df8a64e06fdd1c161db799cd4b63aa03580
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-21 07:02:42 +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
Amit Sunil Dhamne
6426420d08 UsbGadget: Update SDP enum timeout when gadget is pulled up am: ed622856fc am: 00a104bf12
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/24805164

Change-Id: Ib12e1725b92ea2fa30350e584fcecf3ae0b1f270
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-20 18:38:06 +00:00