Commit graph

2981 commits

Author SHA1 Message Date
Steven Moreland
175979b0ca Add persist to CopyEfsTest
Change-Id: I8e12b0ac5e529e15697f35b88ac8b43c798fedd1
Test: atest CopyEfsTest
Flag: TEST_ONLY
Bug: 352567354
2024-09-09 20:50:56 +00:00
Daniel Rosenberg
069a8098b3 Fix CopyEfsTest for symlinks
Use the -L flag to preserve symlinks.
Fixed various flags to ensure we handle symlinks right,
and adjusted the awk string to handle difference in how dates are
represented.

Test: atest CopyEfsTest
Flag: TEST_ONLY
Bug: 352567354
Change-Id: I686c16fc1d771bf00bdc7465beb29a91eaef9e46
2024-09-09 20:50:40 +00:00
Treehugger Robot
e32a7f759b [automerger skipped] Merge "Delete PRODUCT_FULL_TREBLE_OVERRIDE." into main am: 8c1ec1b9e0 am: 3e64c07a4b -s ours
am skip reason: Merged-In I181937f9e49d4b9e1088fc92df7681d1a39e3d26 with SHA-1 c8436d8183 is already in history

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

Change-Id: I90a90a60fa55277d8b8f5061f33e8cbc7d015d4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-09 19:09:43 +00:00
Treehugger Robot
3e64c07a4b Merge "Delete PRODUCT_FULL_TREBLE_OVERRIDE." into main am: 8c1ec1b9e0
Original change: https://android-review.googlesource.com/c/device/google/zuma/+/3254799

Change-Id: If245fe61ad9ab7012b25681d1d37fc6cbb4219f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-09 19:01:27 +00:00
Treehugger Robot
8c1ec1b9e0 Merge "Delete PRODUCT_FULL_TREBLE_OVERRIDE." into main 2024-09-09 18:55:05 +00:00
Treehugger Robot
ffa9cd13fe Merge "Delete PRODUCT_FULL_TREBLE_OVERRIDE." into main 2024-09-09 17:51:17 +00:00
Krzysztof Kosiński
54ceb87f8e Delete PRODUCT_FULL_TREBLE_OVERRIDE.
This variable doesn't do anything for devices launching with
API level 26 or later, and the initial zuma devices (Pixel 8)
launched with API level 34.

Bug: 307369186
Test: presubmit
Flag: EXEMPT trivial build cleanup
Change-Id: I181937f9e49d4b9e1088fc92df7681d1a39e3d26
Merged-In: I181937f9e49d4b9e1088fc92df7681d1a39e3d26
2024-09-09 17:05:00 +00:00
Krzysztof Kosiński
c8436d8183 Delete PRODUCT_FULL_TREBLE_OVERRIDE.
This variable doesn't do anything for devices launching with
API level 26 or later, and the initial zuma devices (Pixel 8)
launched with API level 34.

Bug: 307369186
Test: presubmit
Flag: EXEMPT trivial build cleanup
Change-Id: I181937f9e49d4b9e1088fc92df7681d1a39e3d26
2024-09-09 17:03:22 +00:00
Xin Li
8fd1accc1e [automerger skipped] Merge 24Q3 to AOSP main am: 7e18ab81e1 -s ours am: d8ea5d3412 -s ours
am skip reason: Merged-In I4b2a0a61ebaff5d85a4daac445d81ae3d21aa9c3 with SHA-1 2d0a254101 is already in history

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

Change-Id: I8bf59b12c6f440cb32f7df35d151ef2eb77155ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-07 03:49:31 +00:00
Xin Li
d8ea5d3412 [automerger skipped] Merge 24Q3 to AOSP main am: 7e18ab81e1 -s ours
am skip reason: Merged-In I4b2a0a61ebaff5d85a4daac445d81ae3d21aa9c3 with SHA-1 2d0a254101 is already in history

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

Change-Id: I22de6d889530896c87c8be5e914e80acb5223765
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-07 02:53:34 +00:00
Xin Li
7e18ab81e1 Merge 24Q3 to AOSP main
Bug: 357762254
Merged-In: I4b2a0a61ebaff5d85a4daac445d81ae3d21aa9c3
Change-Id: I56e1840b7862737c84f36c73296253726437d1ca
2024-09-05 17:02:39 -07:00
Ocean Chen
cb4745e9e8 Merge "Switch from the BFQ to the mq-deadline I/O scheduler" into main 2024-09-05 06:37:40 +00:00
Ocean Chen
87bf601c9c Switch from the BFQ to the mq-deadline I/O scheduler
The mq-deadline I/O scheduler is more stable than BFQ. Additionally, the
boot time is shorter with the mq-deadline I/O scheduler. It only changes the scheduler on new kernel.

Bug: 186902601
Test: forrest build

Change-Id: I51605b32afb4340d416fe4923570bb3f4af24ab8
Signed-off-by: Ocean Chen <oceanchen@google.com>
2024-09-05 12:39:25 +08:00
Carmen Yip
9079afec14 Merge "extended_log: update directory permissions for zuma" into main 2024-09-05 04:02:12 +00:00
Les Lee
7512629d19 wifi: Upgrade vendor hal version
Bug: 362355566
Flag: EXEMPT HAL interface change
Test: Build
Change-Id: Idfc752d4f8186b710d6ae33ed29daf22157601cc
2024-09-05 03:48:47 +00:00
carmenyip
5c93636708 extended_log: update directory permissions for zuma
Bug: 336638376

Test: $ cd data/vendor/radio
$ ls -la
Flag: NONE changing directory permissions only

Change-Id: I89d003f286868fa2a593aa627e8d89a721395d79
2024-09-05 02:59:13 +00:00
Charlie Yang
9e6992ba0b Merge "Revert "Add soong config use_google_qns in device/google/zuma/de..."" into main 2024-09-04 13:05:41 +00:00
Charlie Yang
20b924373f Revert "Add soong config use_google_qns in device/google/zuma/de..."
Revert submission 28947244-grilservice

Reason for revert: b/363911795

Reverted changes: /q/submissionid:28947244-grilservice

Change-Id: Iec8b16c4322a6e1a245c4bca22802ab29fe042a5
2024-09-04 11:02:53 +00:00
Treehugger Robot
d2e551958d Merge "Control the "init_dpm.sh" to be built in zuma devices" into main 2024-09-04 06:54:42 +00:00
Herbert Xue
6aabc9bd28 Control the "init_dpm.sh" to be built in zuma devices
Flag: EXEMPT bugfix
Bug: 360757643
Test: lunch husky-trunk_staging-eng && m init_dpm.sh
Change-Id: Ie9822ca65d875c120bc38707aee54353aac5a8b5
2024-09-03 10:25:54 +08:00
Treehugger Robot
094d5d6d51 Merge "Control GoogleDialer built from zuma/proprietary/GoogleDialer" into main 2024-09-02 03:12:37 +00:00
Treehugger Robot
e9d6cf25c8 Merge "Add soong config use_google_qns in device/google/zuma/device.mk" into main 2024-08-30 07:22:56 +00:00
kellyhung
75edad5f45 Add soong config use_google_qns in device/google/zuma/device.mk
Bug: 360757079
Test: lunch r11-trunk_staging-userdebug; m grilservice
Flag: EXEMPT bugfix
Change-Id: Id783f65e12bc93d7db308d15b8440e6ea5007906
2024-08-30 06:39:05 +00:00
Herbert Xue
7d3cb7808c Control GoogleDialer built from zuma/proprietary/GoogleDialer
For PDK build, the "vendor/unbundled_google" path doesn't exist.
"GoogleDialer" will be built from vendor/google_devices/zuma/proprietary/GoogleDialer.

Flag: EXEMPT bugfix
Bug: 358012156
Test: export USES_GOOGLE_DIALER_CARRIER_SETTINGS=true; m GoogleDialer
Change-Id: If2aab058f23cebc5a25862c69deda508f5f9c37e
2024-08-30 10:11:17 +08:00
Treehugger Robot
26ed4214b8 Merge "Delete mapper4 manifest" into main 2024-08-30 01:30:01 +00:00
Rick Yiu
e739e3b254 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: I892b99b79ff2dd9c02cc874026b43b06bded6f59
2024-08-30 00:07:18 +00:00
David Li
fd92ecb65c audio: set util_clamp_min for s/w spatializer to avoid glitches
- power measurement result is on b/262803152#comment5

Bug: 355912013
Test: spatial audio
Flag: EXEMPT bugfix
Change-Id: I324288f219b2fecbc0ae4f3ce3c11ea6e93f4b2e
2024-08-29 11:06:25 +00:00
Ankit Goyal
507675bc2c Delete mapper4 manifest
Bug: 362183626
Flag: EXEMPT manifest update
Test: Boot to home on shiba
Change-Id: Ibb66f97523545a2228c443aa8a08d1d853ed0ccd
2024-08-28 22:56:25 -07:00
Elliott Hughes
879130bc35 The "messaging" package is being removed. am: bc6bb134b9 am: d19b0c3942
Original change: https://android-review.googlesource.com/c/device/google/zuma/+/3241223

Change-Id: Id831f9ba819b6478b2b9f02e36a15a2f7165207d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-26 21:13:01 +00:00
Elliott Hughes
d19b0c3942 The "messaging" package is being removed. am: bc6bb134b9
Original change: https://android-review.googlesource.com/c/device/google/zuma/+/3241223

Change-Id: I28aaa9dcc65b92db914834d4f2d835d420c7533a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-26 20:48:25 +00:00
Elliott Hughes
bc6bb134b9 The "messaging" package is being removed.
Change-Id: Ib952aa3798af0cd39f745991064433700b178e14
2024-08-26 16:06:18 +00:00
Sam Ou
5ba25e00d7 Merge changes from topic "kernel5_revision" into main
* changes:
  bcl: correct ocp threshold
  bcl: support thismeal binary
2024-08-23 10:58:35 +00:00
Roy Luo
5b1ae0048d Merge "Revert^2 "Enable usb state update via udc sysfs"" into main 2024-08-21 22:19:16 +00:00
Daniel Rosenberg
a9271c85ed Add -L to copy_efs_files_to_data.sh
This flag preserves symlinks on the copied images.
With support for this flag, we no longer need to fix up symlinks after
the fact.

Bug: 352567354
Test: atest EfsCopyEfsTest
Flag: EXEMPT bug fix
Change-Id: If26e38856672f6a4b6c55b7921b3aa6268ca9964
2024-08-19 14:38:37 -07:00
Treehugger Robot
afb0dfa68a Merge "persist.sys.hdcp_checking: make default drm-only" into main 2024-08-16 15:39:06 +00:00
Ji Soo Shin
8995732118 persist.sys.hdcp_checking: make default drm-only
In case of always, we always enable hdcp regardless of drm status.

Bug: 359951297
Flag: EXEMPT bugfix
Change-Id: I04b5174be296d93a9f898929706785d50116d7a7
Signed-off-by: Ji Soo Shin <jisshin@google.com>
2024-08-16 11:17:46 +00:00
samou
9da8594109 bcl: correct ocp threshold
Flag: EXEMPT refactor
Bug: 349935208
Change-Id: I2922ca198d6a47f613ecc2c9902256112457fe31
Signed-off-by: samou <samou@google.com>
2024-08-14 12:30:34 +00:00
samou
07a17f736e bcl: support thismeal binary
Test: ./dump_power
Flag: EXEMPT refactor
Bug: 349935208
Change-Id: I74f565133d39ece19b29a036d7b236a754b422d3
Signed-off-by: samou <samou@google.com>
2024-08-14 12:30:13 +00:00
Herbert Xue
3725da4142 Control the modules built from vendor/google_devices/zuma/prebuilts/gpu
For PDK build, the "vendor/arm" path doesn't exist. The modules will be
built from vendor/google_devices/zuma/prebuilts/gpu.

Flag: EXEMPT bugfix
Bug: 357770476
Test: 1. lunch akita-trunk_staging-eng
      2. m libGLES_mali vulkan.mali libOpenCL libgpudataproducer
Change-Id: I97631ffdc98b77b747f0abbc7e376d8fbe2a576d
2024-08-13 12:11:51 +08:00
Xin Li
0a827a5572 [automerger skipped] Merge "Merge 24Q3 (ab/AP3A.240905.001) to aosp-main-future" into aosp-main-future am: ac39e0aa98 -s ours
am skip reason: Merged-In I4b2a0a61ebaff5d85a4daac445d81ae3d21aa9c3 with SHA-1 73a68dd6d3 is already in history

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

Change-Id: Iafcd808a44a8c523e7794511199b3beac15986df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-12 21:03:20 +00:00
Xin Li
443cb51973 [automerger skipped] Merge 24Q3 (ab/AP3A.240905.001) to aosp-main-future am: 868dc34238 -s ours
am skip reason: Merged-In I4b2a0a61ebaff5d85a4daac445d81ae3d21aa9c3 with SHA-1 73a68dd6d3 is already in history

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

Change-Id: I699825561908f5438031d19aae47b00e62359e85
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-12 21:01:32 +00:00
Xin Li
ac39e0aa98 Merge "Merge 24Q3 (ab/AP3A.240905.001) to aosp-main-future" into aosp-main-future 2024-08-12 17:14:31 +00:00
Spade Lee
e06a2b30e2 dump_power: zuma: add FG dump registers path
Bug: 355756379
Test: adb bugreport verify ok
Flag: EXEMPT bugfix
Change-Id: I653a2d0bebe340a16917c30fa2c883f250456aa3
Signed-off-by: Spade Lee <spadelee@google.com>
2024-08-12 14:01:50 +00:00
Sam Ou
7b194e244f Merge "Remove BCL from thermal" into main 2024-08-12 12:32:36 +00:00
Cyan_Hsieh
891557370f Add FSTAB_OWNERS and update OWNERS to include Android.bp am: 4c5e386a84 am: a385f17c95
Original change: https://android-review.googlesource.com/c/device/google/zuma/+/3211864

Change-Id: Iea1eccfe42e54be1a2b1392f586b64519e8d1cb3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-09 11:07:34 +00:00
Cyan_Hsieh
a385f17c95 Add FSTAB_OWNERS and update OWNERS to include Android.bp am: 4c5e386a84
Original change: https://android-review.googlesource.com/c/device/google/zuma/+/3211864

Change-Id: Ie8d81638daa40c9bf4201fbb441e64d487ccc5ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-09 10:49:02 +00:00
Cyan_Hsieh
4c5e386a84 Add FSTAB_OWNERS and update OWNERS to include Android.bp
Flag: EXEMPT only changing OWNERS
Bug: 357036384
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:4c28299c722226798388ceeade9859f05c6d33a1)
Merged-In: I473ff74c06daabcd635eb464766f04725a2c2fbd
Change-Id: I473ff74c06daabcd635eb464766f04725a2c2fbd
2024-08-09 08:34:33 +00:00
Treehugger Robot
482b053892 Merge "Control the build path of mali_csffw.bin" into main 2024-08-09 04:36:51 +00:00
Roy Luo
13756199db Revert^2 "Enable usb state update via udc sysfs"
This reverts commit 70087f4c9e.

Reason for revert: fix breakage in next build with build-time flag in
selinux policy.

Bug: 339241080
Test: tested on Shiba trunk_staging and next builds
Flag: android.hardware.usb.flags.enable_udc_sysfs_usb_state_update
Change-Id: Ifb7764be792494810388858b8672ac7793ed0d42
2024-08-09 00:54:51 +00:00
Xin Li
868dc34238 Merge 24Q3 (ab/AP3A.240905.001) to aosp-main-future
Bug: 347831320
Merged-In: I4b2a0a61ebaff5d85a4daac445d81ae3d21aa9c3
Change-Id: I25d1a1793cc9eb7df743d1e6e9bc84e5f75fbd7d
2024-08-08 11:16:10 -07:00