Commit graph

1388 commits

Author SHA1 Message Date
Android Build Coastguard Worker
34b85d1bc2 Snap for 12373988 from 4e90bf6c68 to 24Q4-release
Change-Id: I7f29f4578090ebe92d50dd89f779f4595b636190
2024-09-16 23:03:06 +00:00
Ryan Prichard
4e90bf6c68 zumapro: avoid vector<const T> am: 678b37960e am: dccfd0f0b8
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zumapro/+/29388100

Change-Id: I7a2622a689cae5d9e51ce1c5b2f6e2c8a57bc238
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-16 20:05:54 +00:00
Ryan Prichard
dccfd0f0b8 zumapro: avoid vector<const T> am: 678b37960e
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zumapro/+/29388100

Change-Id: I85fa1456cc3cb76f5130c43462b0dac3c0d054bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-16 19:41:22 +00:00
Android Build Coastguard Worker
e4078322af Snap for 12368321 from dacaa866b5 to 24Q4-release
Change-Id: I47559213fce4e89b2b9c169a0c1ccab0e8969907
2024-09-14 01:03:14 +00:00
Kuen-Han Tsai
dacaa866b5 Merge "usb: modify initial_descriptor_timeout to 500ms" into main 2024-09-13 09:56:27 +00:00
Kuen-Han Tsai
619db1107c usb: modify initial_descriptor_timeout to 500ms
If the enumeration is too long, it may trigger the watchdog mechanism
to cause device reset. Therefore, this patch will modify the timeout.

Ported from Change-Id: Ib54d8ff5a1e680fc86f2b89ee0d02d63ee5741d8
(usb: modify the initial_descriptor_timeout to 500ms)

Bug: 365715654
Test: verified `initial_descriptor_timeout` is set to 500
Flag: EXEMPT cherry-picked CLs from existing projects
Change-Id: I36c5a0ba0a766720cd7d6601cc56f3a883adac8a
Signed-off-by: Kuen-Han Tsai <khtsai@google.com>
2024-09-13 09:55:25 +00:00
Treehugger Robot
2ec8fd56a5 Merge "Revert "Revert "Move PRODUCT_SHIPPING_API_LEVEL to defined by de..."" into main 2024-09-13 05:54:07 +00:00
Treehugger Robot
51f9731655 Merge "Revert "Disable EHLD"" into main 2024-09-13 03:44:14 +00:00
Cyan Hsieh
d52c3bc6b2 Revert "Revert "Move PRODUCT_SHIPPING_API_LEVEL to defined by de..."
7efa373263a34047b58202cdd90c4bd673936ea7

Bug: 312876454
Change-Id: Ifedf3d3a98845830ff4d2b42e333a384926bc266
2024-09-13 03:43:34 +00:00
Woody Lin
e767cebf22 Revert "Disable EHLD"
This reverts commit 7e10eefc25.

Reason for revert: Re-enable EHLD since kernel EHLD issue is fixed.
Bug: 354380599

Change-Id: I588c2b96a69cabb7be8d264c9591b61da80fb5e2
2024-09-13 01:17:43 +00:00
Android Build Coastguard Worker
a7290c3578 Snap for 12361654 from 2b08e414d0 to 24Q4-release
Change-Id: I5d5a2cc2412b3475ebe9f10d7d3dac7fdd1253bc
2024-09-12 23:02:55 +00:00
Ryan Prichard
678b37960e zumapro: avoid vector<const T>
std::vector<const T> uses std::allocator<const T>, which is an
undocumented libc++ extension to the C++ standard library. The extension
was removed in llvm.org/PR96319. Use an ordinary non-const T instead.

Bug: http://b/349681543
Test: m android.hardware.power.stats-impl.zumapro
Flag: EXEMPT, refactor to fix build failure
Change-Id: I96ab1eb2caf092008cc573949a1529c057ee4bb1
2024-09-12 12:27:36 -07:00
Treehugger Robot
2b08e414d0 Merge "Control GoogleDialer built from zumapro/proprietary/GoogleDialer" into main 2024-09-12 01:50:20 +00:00
Juan Yescas
7e4d66612d 16kb: Select proper fstab for targets that only boot 16kb kernels
The 16kb kernels need to select the fstab that has this configurations:

- data partition:     fstab
- metadata partition: ext4

Bug: 350101696
Test: Built zumapro target and checked mounted partitions
Flag: EXEMPT bugfix
Change-Id: I2fc82946cdbadee7af0b3f6fc026b846fa79a146
2024-09-11 23:56:46 +00:00
Juan Yescas
a14c143c45 16kb: Set f2fs block size to 16384 for targets that only boot 16kb kernels
The f2fs block size has to be set up to 16384 for 16kb kernels.

Bug: 350101696
Test: Built zumapro device and checked mounted partitions
Flag: EXEMPT bugfix
Change-Id: Ie3bf17d78da62a20882b17363afeb3a3a8a984e0
2024-09-11 23:55:31 +00:00
Juan Yescas
a24d3877e1 16kb: Config fstab for targets that only boot 16kb kernels
The zumapro targets that only boot with 16kb kernels will
have this filesystem setup for data and metadata partitions:

- data partition:     f2fs
- metadata partition: ext4

Important: For the HW file encryption to work in the data partition in 16kb kernels the `dusize_4k` parameter has to be set:

```
fileencryption=:aes-256-hctr2:inlinecrypt_optimized+wrappedkey_v0+dusize_4k
```

Bug: 350101696
Test: built pgagnostic target and checked the fs for mounted
      partitions.
Flag: EXEMPT bugfix
Change-Id: I566618e6fa1db2ff4463e00e8d091e7226ba0399
2024-09-11 23:55:31 +00:00
Android Build Coastguard Worker
f7406a1761 Snap for 12354992 from ac5e8f3b81 to 24Q4-release
Change-Id: Iecb3b9f8c6df5bd25bff2ae2d82d2a70596003c7
2024-09-11 23:02:55 +00:00
Chia-Chi Teng
ac5e8f3b81 Merge "Deprecate preloaded_nanoapps.json" into main 2024-09-11 18:41:22 +00:00
Chia-Chi Teng
147b6373f4 Deprecate preloaded_nanoapps.json
Flag: EXEMPT resource only update
Bug: 350102369
Test: on device and presubmit
Change-Id: I8056d46ef653b3cb6b498b02c5aee18ca22a53d0
2024-09-10 01:49:19 +00:00
Android Build Coastguard Worker
6893470ef4 Snap for 12342105 from 9fdb22a36a to 24Q4-release
Change-Id: I85d50586f63ff0d44ee86042dbfe099d7bc0966a
2024-09-09 23:03:36 +00:00
Treehugger Robot
9fdb22a36a Merge "Delete PRODUCT_FULL_TREBLE_OVERRIDE." into main 2024-09-09 18:10:32 +00:00
Krzysztof Kosiński
fc85b23b29 Delete PRODUCT_FULL_TREBLE_OVERRIDE.
This variable doesn't do anything for devices launching with
API level 26 or later, and the initial zumapro devices (Pixel 9)
launched with API level 34.

Bug: 307369186
Test: presubmit
Flag: EXEMPT trivial build cleanup
Change-Id: If23568e7e1fc0dff05467e6b4fc97376c06c2233
2024-09-09 17:11:06 +00:00
Herbert Xue
c0aab4a5f1 Control GoogleDialer built from zumapro/proprietary/GoogleDialer
For PDK build, the "vendor/unbundled_google" path doesn't exist.
"GoogleDialer" will be built from vendor/google_devices/zumapro/proprietary/GoogleDialer.

Flag: EXEMPT bugfix
Bug: 364510147
Test: export USES_GOOGLE_DIALER_CARRIER_SETTINGS=true; m GoogleDialer
Change-Id: I5c6796036627a5ae208dfda3ea19ead550a55c9a
2024-09-09 13:51:29 +08:00
Yixuan Jiang
c0257a0f66 Add pixellogger with non radio
Flag: EXEMPT bugfix
Bug: 353117906
Change-Id: I9223021c1fd0af8b868b5a8c40cc7c9b620ff0aa
Signed-off-by: Yixuan Jiang <yixuanjiang@google.com>
2024-09-09 12:32:09 +08:00
Android Build Coastguard Worker
800084d7bc Snap for 12337246 from 6677617140 to 24Q4-release
Change-Id: I8855d101173f9381580922bf3844b9b26a831088
2024-09-07 21:03:03 +00:00
Xin Li
6677617140 [automerger skipped] Merge 24Q3 to aosp-main-future am: 6bbbcd5877 -s ours am: 277183f3cf -s ours
am skip reason: Merged-In I2cdbd8126e5684891b6424d262aa505d2aa641b7 with SHA-1 9c87f41357 is already in history

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

Change-Id: I3c436e9b5391ee217318c2b263e16977159f27e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-07 04:18:43 +00:00
Xin Li
277183f3cf [automerger skipped] Merge 24Q3 to aosp-main-future am: 6bbbcd5877 -s ours
am skip reason: Merged-In I2cdbd8126e5684891b6424d262aa505d2aa641b7 with SHA-1 9c87f41357 is already in history

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

Change-Id: Ia34ee40e9ee2f35da01833a8d1929421a3723743
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-07 02:59:06 +00:00
Android Build Coastguard Worker
cec97beb63 Snap for 12335440 from e652762f7e to 24Q4-release
Change-Id: I2853bce8d25f8ec6e71e7b3b5f189e9b2fb5d17d
2024-09-07 02:33:16 +00:00
Xin Li
6bbbcd5877 Merge 24Q3 to aosp-main-future
Bug: 357762254
Merged-In: I2cdbd8126e5684891b6424d262aa505d2aa641b7
Change-Id: I8c43a5249c27aa2bba31aa6714d386f275e7d127
2024-09-06 13:48:39 -07:00
Neo Yu
e652762f7e Merge "Move define of hidl radioext to gs-common" into main 2024-09-06 01:41:13 +00:00
Android Build Coastguard Worker
15cb468f3a Snap for 12327203 from 3136f05434 to 24Q4-release
Change-Id: I72f0f5c3445052e23decbbbdc4e3c0519a2f2a3a
2024-09-05 23:02:56 +00:00
Carmen Yip
3136f05434 Merge "extended_log: update directory permissions for zumapro" into main 2024-09-05 04:02:12 +00:00
carmenyip
e7925e4638 extended_log: update directory permissions for zumapro
Bug: 336638376

Test: verify with `ls -la` on directory
Flag: NONE changing directory permissions only
Change-Id: Ic978ae7af017a49564507865641db4d9892449cc
2024-09-05 02:59:26 +00:00
Android Build Coastguard Worker
1541176dd1 Snap for 12319997 from 9d2f2f20cc to 24Q4-release
Change-Id: Ibeda4a402f1f4edbfc51d972dec90a8cfa48c5cd
2024-09-04 23:03:31 +00:00
Charlie Yang
9d2f2f20cc Merge "Revert "Add soong config use_google_qns in device/google/zumapro..."" into main 2024-09-04 13:05:40 +00:00
Charlie Yang
86dc4ddddd Revert "Add soong config use_google_qns in device/google/zumapro..."
Revert submission 28947244-grilservice

Reason for revert: b/363911795

Reverted changes: /q/submissionid:28947244-grilservice

Change-Id: Ib13bc42b054a627271c55d06f1190912c824d03d
2024-09-04 11:03:29 +00:00
Android Build Coastguard Worker
b4d7d39e64 Snap for 12309590 from 480651ab83 to 24Q4-release
Change-Id: I109695a061eae7fa2d1d1ac42d3f667f6f57f547
2024-09-02 23:02:52 +00:00
Neo Yu
c9f3f6d8a1 Move define of hidl radioext to gs-common
Bug: 283064367
Test: verify with test ROMs
Flag: EXEMPT HAL interface change
Change-Id: Ia587c3dbca175e8129acd863909ca68e5df1dd87
2024-09-02 15:36:56 +08:00
Treehugger Robot
480651ab83 Merge changes I8e4aa0b2,I09499642 into main
* changes:
  Rename enable_usb dev node to move_data_to_usb
  Usb: Update UsbDataStatus while being docked
2024-09-02 02:39:37 +00:00
Jason Chiu
27a8298d1a Merge "Revert "16kb: Verify that zumapro prebuilts are 16kb compatible"" into main 2024-09-02 00:55:30 +00:00
Pindar Yang
56e949cdce Revert "16kb: Verify that zumapro prebuilts are 16kb compatible"
This reverts commit a5372bac75.

Reason for revert: Build break. Bug: 363170018

Bug: 363170018
Bug: 363816648
Change-Id: I1a0d7ad852b375e77aa6c8fff0112e9c1014a56e
2024-09-02 00:27:04 +00:00
Android Build Coastguard Worker
263b49a89d Snap for 12304452 from a164bd2210 to 24Q4-release
Change-Id: Ic69016c1faf473dd0c225044c358064e08599b1b
2024-08-31 01:03:06 +00:00
Treehugger Robot
a164bd2210 Merge "Add soong config use_google_qns in device/google/zumapro/device.mk" into main 2024-08-30 07:22:56 +00:00
kellyhung
cd60c30bef Add soong config use_google_qns in device/google/zumapro/device.mk
Bug: 360757079
Test: lunch r11-trunk_staging-userdebug; m grilservice
Flag: EXEMPT bugfix
Change-Id: I3254d83d0aadc403cb6ce6470e601cf336957319
2024-08-30 06:39:41 +00:00
Treehugger Robot
83ccb2a768 Merge "Delete mapper4 manifest" into main 2024-08-30 01:30:01 +00:00
KRIS CHEN
1a6e5bb135 Merge "Set permission for local_hbm_delay_frames" into main 2024-08-30 01:19:49 +00:00
Rick Yiu
53452df2c5 Restore preferred_idle_mask to the default setting
The preferred_idle_mask is changed during boot time, but it does not
restore to the default setitng as in powerhint, so some node may keep
the wrong value when framework restarts.

Bug: 248621289
Test: build pass
Flag: NONE init rc file change does not support flags
Change-Id: Ib11681b9a751b1d67d02e9788d888e515d5a3519
2024-08-30 00:06:56 +00:00
Android Build Coastguard Worker
f8807414ab Snap for 12296955 from a695b0f4a1 to 24Q4-release
Change-Id: I3161da8777859a9441d765f3e96b4c2295a777f4
2024-08-29 23:02:43 +00:00
Badhri Jagan Sridharan
f16ad49244 Rename enable_usb dev node to move_data_to_usb
kernel dev attribute has now been renamed from enable_usb
to move_data_to_usb. Update the same.

Bug: 251381400
Bug: 357028350
Flag: EXEMPT bugfix
Signed-off-by: Badhri Jagan Sridharan <badhri@google.com>
Change-Id: I8e4aa0b2e09bfef807f0169eabb79e2fa2e4d2c7
(ported from ag/20309232)
Signed-off-by: Kyle Tso <kyletso@google.com>
2024-08-29 14:28:52 +00:00
Badhri Jagan Sridharan
7ebbf913ef Usb: Update UsbDataStatus while being docked
Bug: 275150939
Bug: 357028350
Change-Id: I09499642012c7e95bb5a5fef1ac6eb7b8c4e6832
Signed-off-by: Badhri Jagan Sridharan <badhri@google.com>
(ported from ag/22273065)
Signed-off-by: Kyle Tso <kyletso@google.com>
2024-08-29 14:02:06 +00:00