Commit graph

879 commits

Author SHA1 Message Date
Treehugger Robot
aff12f912d Merge "Add ueventd entries for new BT channel in AoC" into main 2023-11-30 00:32:17 +00:00
Hiroshi Akiyama
47fcb7d7b4 bcl: Update soft_ocp_gpu to 5A and ocp_gpu to 8A
Presently the SOFT_OCP_GPU setting is very close to the actual OCP_GPU
level. Lower to 5A to separate the trigger levels. Update OCP_GPU to 8A
from 12A which exceeds programmable threshold.

Bug: 311832771
Test: boot device and check sysfs node readout for triggered_lvl
Change-Id: I27f9834200af1a85a1cf1abee2d9b58374cbb321
Signed-off-by: Hiroshi Akiyama <hiroshiakiyama@google.com>
2023-11-30 00:17:31 +00:00
Guibing Cai
58b1c75dc2 Merge "zumapro: init: port the zuma perf configurations to proto device init.zuma.rc." into main 2023-11-29 21:10:38 +00:00
guibing
4e71b9adf2 zumapro: init: port the zuma perf configurations to proto device init.zuma.rc.
Current zumapro proto devices are using init.zuma.rc which is a copy of
init.zumapro.rc. It won't work well for proto devices since it's based
on zuma soc. This change ports perf related configurations from zuma.

Also fix few perf configurations in current zumapro init rc file.

Bugs: 313501809
Test: build, flash and device boots
Change-Id: I3825f0b2e3fa8023ae6f953bb674cd32ddc53581
2023-11-29 00:45:04 +00:00
Sam Ou
7c8ae6703a Merge "pixelstats: Add Lastmeal csv path" into main 2023-11-28 12:20:13 +00:00
Zhibin Liu
bd2c88a8b4 Add Satellite Pointing UI configs for Zuma Pro
See the class at http://google3/java/com/google/android/apps/scone/satellite/pointingui/ui/AndroidManifest.xml;l=8;rcl=585803067

Test: config change
Bug: 313553794
Change-Id: I82db86eb34cf42d7f10423f4f3fc9bbef7ec7b67
2023-11-28 05:35:48 +00:00
Luis Delgado de Mendoza
c7323284f3 Add ueventd entries for new BT channel in AoC
Bug: 308452948
Test: Validated locally on husky.
Change-Id: If3b1741e09fbd9402c938d806e9673772da3973c
2023-11-27 18:10:08 +00:00
Zheng Pan
3e8822cb4d Remove the debug line
Debug line is not removed when merge ag/25455125

Bug: 311016628
Test: None
Change-Id: I61f7a7f62c177c969e2554b0eec0b70932342117
2023-11-27 09:48:31 -08:00
Tai Kuo
6484dddf01 Remove unused vibrator mk
Bug: 246459244
Test: n/a
Change-Id: Ia7259112416a5560ada27116eb02b964999ee26c
2023-11-27 14:32:37 +08:00
Treehugger Robot
8ea5df7cfc Merge "Rename init.p24.zuma.rc to init.zuma.rc" into main 2023-11-23 08:25:18 +00:00
Cyan Hsieh
644cdb70ae Merge changes from topic "ship_api_34_zumapro" into main
* changes:
  Upgrade PRODUCT_SHIPPING_API_LEVEL to 34
  Upgrade VINTF Target FCM level from 7 to 8
2023-11-23 08:21:05 +00:00
Treehugger Robot
74654d5111 Merge "Check dev_type violations" into main 2023-11-23 01:37:49 +00:00
Zheng Pan
5a86729634 Rename init.p24.zuma.rc to init.zuma.rc
Bug: 311016628
Test: make image and boot to home
Change-Id: I3240ce46a425150d7b87dd9ac0b3c38769d78be1
2023-11-22 15:10:59 -08:00
Donnie Pollitz
5b899a731f Merge "Fix ueventd for trusty_userdata" into main 2023-11-22 08:07:38 +00:00
Inseob Kim
a4e6032067 Check dev_type violations
This is to prepare dev_type test earlier. It checks whether /dev nodes
have labeles with dev_type or not.

Bug: 303367345
Test: build
Change-Id: I4feb079d4a3badc6362127a09f8d458755d7d2d2
2023-11-22 13:43:08 +09:00
Gary Jian
577b0794e2 Merge "Handle the network selection restoring in modem side" into main 2023-11-22 03:49:51 +00:00
George Lee
f1e552d48c pixelstats: Add Lastmeal csv path
Bug: 299700579
Test: Local test
Change-Id: I65bfc3e09277c58688bba80d7a5c59fda4cc5178
Signed-off-by: George Lee <geolee@google.com>
2023-11-22 01:14:00 +00:00
Will McVicker
736b796c90 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: If5ec2d8bcada451bb8291e66ca17014d2fa4ba1b
2023-11-21 16:41:54 -08:00
Gary Jian
8a43604e4f Handle the network selection restoring in modem side
Bug: 311563248
Test: manual
Change-Id: I9b8e2fc251db8b338849e67c29ca7230a4227dec
2023-11-21 08:25:16 +00:00
Donnie Pollitz
68e2fd7ecb Fix ueventd for trusty_userdata
Bug: 301677815
Test: Ran trusty storage port tests
Change-Id: I1bf309d61594e7481e2847e36acf5b714db90876
Signed-off-by: Donnie Pollitz <donpollitz@google.com>
2023-11-21 09:16:08 +01:00
Chungjui Fan
8f8af7426c Upgrade PRODUCT_SHIPPING_API_LEVEL to 34
Bug: 310792617
Change-Id: I37b90cfaa2e29a919f4912dd0849c7c38ca8236d
Signed-off-by: Chungjui Fan <chungjuifan@google.com>
2023-11-20 09:53:35 +00:00
Cyan_Hsieh
f372e7e832 Upgrade VINTF Target FCM level from 7 to 8
Target FCM level 8 requires the newer version of the following HALs:
  android.hardware.boot
Add the older version of these HALs into the customized product FCM

Remove below from customized product FCM and follow general rule:
  android.hardware.biometrics.face
  android.hardware.biometrics.fingerprint
  android.hardware.contexthub
  android.hardware.radio.config

Bug: 310792617
Change-Id: Ide9a0fd3cab4f6b23179b93d4a814eac3ede7b67
2023-11-20 17:51:02 +08:00
Ruofei Ma
b8239d304a Merge "Enable adaptive playback for BigWave" into main 2023-11-18 05:16:02 +00:00
Zheng Pan
523dcb1be8 Merge "Add init.p24.zuma.rc" into main 2023-11-17 22:24:08 +00:00
RD Babiera
637426c6a8 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
06544fd893 Enable adaptive playback for BigWave
Bug: 309722491

Change-Id: I64d1d6f31cfe2f7804e932fe40f6069c084617cb
Signed-off-by: Ruofei Ma <ruofeim@google.com>
2023-11-17 22:08:30 +00:00
Treehugger Robot
e170559562 Merge "zumapro: add c2.android.av1-dav1d.decoder in media_codecs_performance_c2.xml" into main 2023-11-17 09:37:21 +00:00
Zheng Pan
e8f94e37f6 Add init.p24.zuma.rc
For P24 proto devices, they use zuma soc, it should load init.zuma.rc.
However due to hw difference between P23 and P24, init.zuma.rc cannot
be used on P24 directly. As P24 is brought up using init.zumapro.rc.
Fork init.p24.zuma.rc from init.zumapro.rc for P24 only.

Bug: 311016628
Test: flash KM4 proto and make sure init.zuma.rc is loaded.
Change-Id: Ib28b7ed5cf8b6f1bad1a7494a31a4eeaab608b67
2023-11-16 19:54:12 -08:00
RD Babiera
f7aa346d9b Merge changes from topic "usb-cw-zumapro" into main
* changes:
  usb: update usb hal version to v3
  usb: update incompatible charger warning reason
  Usb: Populate connected status of non compliant port partners only when not populated
  Usb: Set connected status when connected to non compliant port partners
  Usb: non-compliant port partner implementation
2023-11-17 01:35:47 +00:00
RD Babiera
d7ac262f4a 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
(cherry picked from commit 04d1e94d10515f03e66cdfe16a23924e561cb3f3)
Change-Id: I96563c9900a01e428850e4873371bcdb0225aa07
Signed-off-by: RD Babiera <rdbabiera@google.com>
2023-11-17 01:20:13 +00:00
Tim Lin
2e81f17b0c Merge changes from topic "enable_p24_ntn" into main
* changes:
  Add default PixelSatelliteService package name
  enable SUPPORT_VENDOR_SATELLITE_SERVICE
2023-11-16 23:47:24 +00:00
Jerry Huang
6a855842ba zumapro: 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: I7fa441b94127bcde45363d5445b97537358d6759
2023-11-16 12:27:01 +00:00
Roy Luo
03fbf970bb usb: update usb hal version to v3
Bug: 308700954
Bug: 301380358
Test: atest vts_treble_vintf_vendor_test
Change-Id: I724a170a1403dec7eecbc33d7f532471f09b559f
2023-11-16 00:03:56 +00:00
Roy Luo
acf4e01386 usb: update incompatible charger warning reason
Report COMPLIANCE_WARNING_INPUT_POWER_LIMITED instead of
COMPLIANCE_WARNING_OTHER to flag incompatible chargers. The underlying
logic that generates the warning remains the same, what's changed is
the enum that's being used.
The purpose of the change is to have a warning type that better
represents what actually happens and free up COMPLIANCE_WARNING_OTHER
that was intended to act as a fallback reason code.
The flag enable_input_power_limited_warning controls whether to switch
to the new enum, while the flag enable_usb_data_compliance_warning
controls the new enums that are added as FlaggedApi in the framework.
Both flags need to be on to enable the change.

Bug: 308700954
Bug: 301380358
Test: manual tests with local flag override
Change-Id: I6595706d1b83d533fc2d3e29086773270e045ede
2023-11-16 00:03:49 +00:00
Badhri Jagan Sridharan
3c94c8bb80 Usb: Populate connected status of non compliant port partners only when not populated
Set mode, power role and data role on non compliant port partners
only if the portStatus is not already populated. Compliance warnings
such as missing rp do not populate these fields during
getPortStatusHelper

Test: manual test on device
Bug: 279251052
Bug: 301380358
Change-Id: Ibe71bdd5c521ba90c124d89bd56af90087c0df18
2023-11-16 00:03:24 +00:00
Badhri Jagan Sridharan
0991cd02ca Usb: Set connected status when connected to non compliant port partners
Set mode, power role and data role when connected to non compliant
port partners.

Test: manual test on device
Bug: 268584498
Bug: 301380358
Change-Id: I6c3e7df09a61e26f3b976a86bd65cb646edd653d
Signed-off-by: Badhri Jagan Sridharan <badhri@google.com>
(cherry picked from commit 7c2d62aafc219af11252dabf49d84d84b7ccfa57)
2023-11-15 18:23:56 +00:00
RD Babiera
90ece745e5 Usb: non-compliant port partner implementation
Adds vendor code for non-compliant charger feature.

Minor port of commit 96ccf93453583642a15dd96b1e4d6bf0645fc10b

Test: atest VtsAidlUsbTargetTest
Test: manual test on device
Bug: 301380358
Change-Id: Ie1a48b1acaaae9a53f3b9bfebcfee7a2f4814810
(cherry picked from commit 96ccf93453583642a15dd96b1e4d6bf0645fc10b)
2023-11-15 18:23:48 +00:00
Darren Hsu
033e0f615b powerstats: update NFC sysfs path for ZumaPro
Bug: 291862254
Test: vts-tradefed run vts -m VtsHalPowerStatsTargetTest
Change-Id: I12d3d5601776e0e130d55e3078d2024a363599d1
Signed-off-by: Darren Hsu <darrenhsu@google.com>
2023-11-15 16:51:12 +08:00
Jack Lee
a9b726427b Merge "Disable zone DMA32 and swiotlb" into main 2023-11-15 05:47:33 +00:00
Hiroshi Akiyama
dd488a57b5 Merge "bcl: change SMPL_WARN voltage to 3.0V from 3.1V" into main 2023-11-14 22:40:49 +00:00
Guibing Cai
cba7aafcef Merge "zumapro: init: update vendor_sched procfs paths." into main 2023-11-14 20:17:36 +00:00
guibing
dce82707ac zumapro: init: pmu_poll_enable node readable
This is from zuma change: ag/23020748
Bug: 309473644
Test: Manual check on device

Change-Id: I4d319550d74e74cbfe7364ef1306f61b3bacc945
2023-11-14 19:04:47 +00:00
guibing
30adf5098f zumapro: init: 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: pts-tradefed run commandAndExit pts -m PtsPerfWbsTestCases
      -t com.google.android.perfwbs.pts.SchedulerTest
Change-Id: I22a97a08a87a402fb661a90a1e1c7a7a7f8536b3
2023-11-14 18:44:52 +00:00
Yvonne Yip
ff36b058f5 init: copy over perf related settings from zuma
Test: boot on device
Bug: b/309473644
Change-Id: I526c4d771a0580a75afa661026e932558b97a543
2023-11-13 21:31:26 -08:00
Carter Hsu
bc591e53c8 Merge "Revert "audio: add CCA property"" into main 2023-11-13 08:02:22 +00:00
Carter Hsu
95a344a388 Revert "audio: add CCA property"
This reverts commit c52a4b28f6.

Reason for revert: build break

Change-Id: I544d53f9a1189501d781aebfb60f735555849ec4
2023-11-13 07:57:53 +00:00
Carter Hsu
1cc08d5928 Merge "audio: add CCA property" into main 2023-11-13 07:34:05 +00:00
Carter Hsu
c52a4b28f6 audio: add CCA property
Bug: 310485392
Test: build pass
Change-Id: Idc0b28e0dd5dfaf893ea747766f42f51484009cc
Signed-off-by: Carter Hsu <carterhsu@google.com>
2023-11-13 00:41:29 +00:00
Jack Wu
e0295bbb59 zumapro: update AIDL IGoogleBattery manifest version to 3
Bug: 309518527
Test: TH
Change-Id: I2ef65e11c81d4130baf7317a0d98a6806547ac6f
Signed-off-by: Jack Wu <wjack@google.com>
2023-11-11 03:51:53 +00:00
Ken Yang
289af8fccf [automerger skipped] RESTRICT AUTOMERGE : dump_power: correct the section header am: 07714c957b am: 2b861612c7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9389cde7424e5d1fbc6f5f2e0e6736665864c36d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-10 08:34:28 +00:00