Commit graph

2500 commits

Author SHA1 Message Date
Roy Luo
585d72a3bd Merge "Revert^2 "usb: introduce UsbDataSessionMonitor class"" into main 2023-12-09 00:22:06 +00:00
Xin Li
3db3ce96a7 Merge Android 14 QPR1
Merged-In: I12add8918fb1922029cbbee130be33a3a36e44a4
Bug: 315507370
Change-Id: I1327fae09a2fa96de643bce11ece9e98eaada3b2
2023-12-08 13:16:15 -08:00
Roy Luo
09f98e2ed6 Revert^2 "usb: introduce UsbDataSessionMonitor class"
3e5743c521

Bug: 297224564
Bug: 296119135
Change-Id: I4fc7da8c628292bb2c702c6fd3f059202e6ca82b
2023-12-08 20:15:27 +00:00
Xin Li
534bf242d1 [automerger skipped] Merge UQ1A.231205.015 am: 8dadca19cf -s ours am: 742a283039 -s ours
am skip reason: Merged-In Icc611e53d39734b7f6ce9c70ca601d61ec4d4e33 with SHA-1 707c8849e5 is already in history

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

Change-Id: Ibc132157b4a2e53338a0fc4d5aacadbb3c64ac52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-08 08:51:03 +00:00
Xin Li
742a283039 [automerger skipped] Merge UQ1A.231205.015 am: 8dadca19cf -s ours
am skip reason: Merged-In Icc611e53d39734b7f6ce9c70ca601d61ec4d4e33 with SHA-1 707c8849e5 is already in history

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

Change-Id: I8ef810d771cf4155fd98d8352a2b09a18c6f3c8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-08 08:21:16 +00:00
Xin Li
8dadca19cf Merge UQ1A.231205.015
Bug: 308969284
Merged-In: Icc611e53d39734b7f6ce9c70ca601d61ec4d4e33
Change-Id: I12add8918fb1922029cbbee130be33a3a36e44a4
2023-12-07 15:47:54 -08:00
Treehugger Robot
ec93b1bbd4 Merge "dump_power: add eusb_repeater path to dump registers" into main 2023-12-06 06:09:31 +00:00
Roy Luo
1dc0d70de4 Merge "Revert "usb: introduce UsbDataSessionMonitor class"" into main 2023-12-05 17:13:34 +00:00
Qian-Hao Huang
3e5743c521 Revert "usb: introduce UsbDataSessionMonitor class"
Revert submission 25524752-usbDataSessionMonitor

Reason for revert: Test for gs101/gs201 boot blocking issue (b/314904288)

Reverted changes: /q/submissionid:25524752-usbDataSessionMonitor

Change-Id: I8265d57152460693fe668c2d9d188037dec6e692
2023-12-05 09:36:10 +00:00
Ray Chi
d120b32a73 dump_power: add eusb_repeater path to dump registers
Bug: 305145476
Test: adb bugreport
Change-Id: I96611e7741380661c0277107e8b0763e79cb6c94
2023-12-05 16:36:52 +08:00
Jason Chiu
10343c4fbf zuma: include bootctrl_aidl.mk from gs-common
Bug: 265063384
Change-Id: Ia17b1506e1ea00b2df34b1ced6bea6d37d6a8a58
Signed-off-by: Jason Chiu <jasoncschiu@google.com>
2023-12-05 00:46:12 +08:00
Jason Chiu
e555c307b2 zuma: move bootctrl service declaration to gs-common
Bug: 265063384
Change-Id: Ibd98a40b397361146638381c5cfc1c3d2544b18f
Signed-off-by: Jason Chiu <jasoncschiu@google.com>
2023-12-05 00:46:08 +08:00
Jason Chiu
fb463a38fd zuma: move bootctrl hal to gs-common
Bug: 265063384
Change-Id: I25924866d2bad4dbe7c14484caa29bf527f85451
Signed-off-by: Jason Chiu <jasoncschiu@google.com>
2023-12-05 00:46:03 +08:00
Roy Luo
62f3a1abc4 Merge "usb: introduce UsbDataSessionMonitor class" into main 2023-12-01 16:43:44 +00:00
Dario Freni
24678b1d38 Merge changes from topic "revert-25477883-gs-common_bootctrl-aidl-APKJEMYEPE" into main
* changes:
  Revert "zuma: move bootctrl hal to gs-common"
  Revert "zuma: move bootctrl service declaration to gs-common"
  Revert "zuma: include bootctrl_aidl.mk from gs-common"
2023-12-01 13:00:07 +00:00
Sebastian Pickl
8676a0deff Revert "zuma: move bootctrl hal to gs-common"
Revert submission 25477883-gs-common_bootctrl-aidl

Reason for revert: breaking builds b/314240126

Bug: 314240126

Reverted changes: /q/submissionid:25477883-gs-common_bootctrl-aidl

Change-Id: If413155d4a2129c482ae98a128dc05b4aaba5374
2023-12-01 11:30:35 +00:00
Sebastian Pickl
ae2cacc6e2 Revert "zuma: move bootctrl service declaration to gs-common"
Revert submission 25477883-gs-common_bootctrl-aidl

Reason for revert: breaking builds b/314240126

Bug: 314240126

Reverted changes: /q/submissionid:25477883-gs-common_bootctrl-aidl

Change-Id: Ib0fb8d03bb4592cfb0c9f5427326193b3ae16da0
2023-12-01 11:30:35 +00:00
Sebastian Pickl
65439a058c Revert "zuma: include bootctrl_aidl.mk from gs-common"
Revert submission 25477883-gs-common_bootctrl-aidl

Reason for revert: breaking builds b/314240126

Bug: 314240126

Reverted changes: /q/submissionid:25477883-gs-common_bootctrl-aidl

Change-Id: I126138b048512fe6b2bbb2d8463152974e8f7c0a
2023-12-01 11:30:35 +00:00
Kieran Cyphus
8534e092af Merge "LogMaskLibrary: Add newlines and fix posix perms" into main 2023-12-01 07:24:52 +00:00
Treehugger Robot
2b39200fec Merge changes from topic "gs-common_bootctrl-aidl" into main
* changes:
  zuma: include bootctrl_aidl.mk from gs-common
  zuma: move bootctrl service declaration to gs-common
  zuma: move bootctrl hal to gs-common
2023-12-01 03:57:28 +00:00
Treehugger Robot
942564adee Merge "Update default color temperature for night light" into main 2023-12-01 03:36:42 +00:00
Roy Luo
ea65ca11f6 usb: introduce UsbDataSessionMonitor class
Migrate the usb data session event functions to the class with the
following additional functionalities;
- Support detecting gadget soft pulldown (usually done during configfs
  function switch) and report usb data session correctly.
- Support reporting usb data compliance warnings to the class USB
  by providing getDataComplianceWarnings call.
- Use boot_clock instead of steady_clock to measure time correctly in
  the case of system suspend.

UsbDataSessionMonitor is self-contained and can be migrated to pixel usb
library after feature maturation.

Bug: 297224564
Bug: 296119135
Test: usb data session upload in device and host mode
Change-Id: Iba001933e193935d64cf5fd0a1257d02a4274fb1
2023-11-30 21:43:04 +00:00
Muralidhar Reddy Mule
e18209fef7 Merge "[LPA][Zuma] Add notification pregrant" into udc-qpr-dev am: 7a01eb40ef am: 4dbb989e10
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/25269253

Change-Id: I27731b7980f389362287d2a32a2ff9e6dd37bb0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-30 15:34:43 +00:00
Muralidhar Reddy Mule
4dbb989e10 Merge "[LPA][Zuma] Add notification pregrant" into udc-qpr-dev am: 7a01eb40ef
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/25269253

Change-Id: I7617597b84f82597b16a635159c15bd67ef3dfb4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-30 14:48:04 +00:00
Muralidhar Reddy Mule
7a01eb40ef Merge "[LPA][Zuma] Add notification pregrant" into udc-qpr-dev 2023-11-30 14:05:26 +00:00
Peter Lin
dc330b5e88 Update default color temperature for night light
Bug: 302396607
Test: adb shell dumpsys color_display | grep "Color temp"
Change-Id: If106f81c0dd2bd81a48e156e1cc75dba4a885aca
2023-11-30 07:51:45 +00:00
Treehugger Robot
73592fb6ac Merge "Ueventd changes for new BT channel in zuma" into main 2023-11-30 00:32:17 +00:00
Treehugger Robot
d05c6ad1e6 Merge "Handle empty read from file." into main 2023-11-29 17:59:23 +00:00
Edgar Arriaga García
6a3349663d Merge "Add webview pinning for zuma devices" into main 2023-11-27 18:05:05 +00:00
Jason Chiu
f16d3f60d2 zuma: include bootctrl_aidl.mk from gs-common
Bug: 265063384
Change-Id: I95cc9feca160004ee1d1c8fdf85da92b894d01d5
Signed-off-by: Jason Chiu <jasoncschiu@google.com>
2023-11-27 17:36:02 +08:00
Jason Chiu
0c71ce55cc zuma: move bootctrl service declaration to gs-common
Bug: 265063384
Change-Id: Ic37e0e5fc5aa4730afdd9378cf7123f9216fb573
Signed-off-by: Jason Chiu <jasoncschiu@google.com>
2023-11-27 17:34:32 +08:00
Jason Chiu
719c85d06e zuma: move bootctrl hal to gs-common
Bug: 265063384
Change-Id: I03d2f96928cfa3d2dc8aa15ac285bdef05780bfd
Signed-off-by: Jason Chiu <jasoncschiu@google.com>
2023-11-27 17:34:03 +08:00
Tai Kuo
f9eedf7d34 Merge "Remove unused vibrator mk" into main 2023-11-27 08:00:23 +00:00
Tai Kuo
04d36f987f Remove unused vibrator mk
Bug: 246459244
Test: n/a
Change-Id: I1b6f5411c38118e72d059c1c93c0a27dce7c1528
2023-11-27 14:27:27 +08:00
Florian Mayer
251d00eb0e Handle empty read from file.
Test: run /vendor/bin/dump/dump_power
Bug: 312681873
Change-Id: I8c49cf7f0048190f02d35d50984abca361d517f1
2023-11-22 11:49:27 +00:00
Martin Liu
e55232fbac adjust PCP high level
We have observed more reclaiming activities as upstream
has changed how PCP high is calculated since 5.15 kernel.
Re-align the level back to 5.10 first so we can monitor
how it impacts the MM metrics.

Bug: 309409009
Test: boot
Change-Id: I7ac1eb88a8dae7c823330a2c75aec9547bd5c427
Signed-off-by: Martin Liu <liumartin@google.com>
2023-11-21 10:24:32 +00:00
kierancyphus
741d0c09d7 LogMaskLibrary: Add newlines and fix posix perms
Bug:302435001
Test: Manually build, flash, `adb shell ls -l \
/data/vendor/radio`

Change-Id: If2696c577e66ee27a042ebe8d6ff61a9e832caec
2023-11-21 05:52:39 +00:00
Luis Delgado de Mendoza
9344919fe5 Ueventd changes for new BT channel in zuma
Bug: 308452948
Test: Validated locally on husky.
Change-Id: I4534d3c007f93e7dbd2ec3ed1f32d30ba8a90ea9
2023-11-17 20:02:43 -08:00
Ruofei Ma
09160b77ca Merge "Enable adaptive playback for BigWave" into udc-qpr-dev am: c9e0f1c3ed am: 2fea711bd5
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/25398212

Change-Id: I1812a2e5cfd27cf19b397a39a21d67b8ab3d85a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-17 23:03:04 +00:00
Ruofei Ma
2fea711bd5 Merge "Enable adaptive playback for BigWave" into udc-qpr-dev am: c9e0f1c3ed
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/25398212

Change-Id: I542cf8cbbf506b1ef8e71d86d93bf1d705013543
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-17 22:29:24 +00:00
RD Babiera
c92ee8d02a Merge "usb: reattempt to enter displayport alt mode if driver entry process fails" into main 2023-11-17 22:12:05 +00:00
Ruofei Ma
c9e0f1c3ed Merge "Enable adaptive playback for BigWave" into udc-qpr-dev 2023-11-17 22:02:44 +00:00
Ruofei Ma
d7b343305d Enable adaptive playback for BigWave
Bug: 309722491

Change-Id: Ibc5a88efc535cc847fbde45541d451ee97c65a1e
Signed-off-by: Ruofei Ma <ruofeim@google.com>
2023-11-16 18:04:53 +00:00
Jerry Huang
228db5e2a5 zuma: add c2.android.av1-dav1d.decoder in media_codecs_performance_c2.xml
c2.android.av1-dav1d.decoder is based on dav1d implementation.
This dav1d-based sw av1 decoder provides better decoding throughput
than the default gav1-based av1 decoder on mid-to-low-tier devices.
c2.android.av1.decoder will be deprecate eventually before that we keep
both decoders.

Bug: 309412792
Test: run cts -m CtsMediaDecoderTestCases -t android.media.decoder.cts.VideoDecoderPerfTest --module-arg CtsMediaDecoderTestCases:instrumentation-arg:codec-prefix:=c2.android.av1.decoder
Change-Id: Ib66db8bf037de5ece05047f98bc176a79aca8aa7
2023-11-16 12:26:50 +00:00
RD Babiera
04d1e94d10 usb: reattempt to enter displayport alt mode if driver entry process fails
In the kernel, it is possible for the DisplayPort Alt Mode
driver to queue an Enter Mode message to the tcpm and have
that message be interupted by a Power Role or Vconn swap,
which results in the Port Partner never entering Alt Mode.

Add a debounce that checks to make sure that the port partner
enters Alt Mode when DisplayPort Alt Mode is active on the
port. On trigger, reattempt to send Enter Mode through the
tcpm up to 2 times.

Test: Manual test on device - put device into Preferred
      Source role, test to see if Alt Mode reentry triggers
      when original entry is interrupted by PR Swap from
      monitor.
Bug: 308383356
Change-Id: I96563c9900a01e428850e4873371bcdb0225aa07
Signed-off-by: RD Babiera <rdbabiera@google.com>
2023-11-15 22:08:36 +00:00
Roy Luo
c55415c1e2 usb: update usb hal version to v3
Bug: 308700954
Test: atest vts_treble_vintf_vendor_test
Change-Id: I724a170a1403dec7eecbc33d7f532471f09b559f
2023-11-14 20:41:47 +00:00
Treehugger Robot
78a70da442 Merge "zuma: update AIDL IGoogleBattery manifest version to 3" into main 2023-11-13 06:58:05 +00:00
Alan Chen
128a61054b Merge "Add extensive_logging config file" into main 2023-11-13 05:47:28 +00:00
Will McVicker
d6716ccd63 fstab: allow unlocked devices to boot with AVB test key am: 1bc7e21a38 am: 9e663230ab
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/25347023

Change-Id: I21eed5267eeff6443478301fe9b039c27aaf3f99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-13 04:39:36 +00:00
Will McVicker
9e663230ab fstab: allow unlocked devices to boot with AVB test key am: 1bc7e21a38
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/25347023

Change-Id: I2af7647f22ccbee3b5dd55f8d022e444d3d461f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-13 04:07:51 +00:00