Xin Li
7b5c85c110
Merge 24Q3 (ab/11976889) to aosp-main-future
...
Bug: 347831320
Merged-In: I3a3c91ec742a46169cab8c57d32b5faef49603c6
Change-Id: I6b1ac65472fe5352eb3987d183300b3b0ba7b9c3
2024-06-18 14:13:21 -07:00
Xin Li
cec6beaf3d
[automerger skipped] Merge Android 14 QPR3 to AOSP main am: 5e9e79c56b
-s ours
...
am skip reason: Merged-In I085b9bae6ea33c255634fe4406b41bf9f3502efe with SHA-1 a0932dbfbe
is already in history
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/3131974
Change-Id: Ife6ba5879fd3cd88a8b4555e55f7d1b254cbb0cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-17 20:41:29 +00:00
Xin Li
5e9e79c56b
Merge Android 14 QPR3 to AOSP main
...
Bug: 346855327
Merged-In: I085b9bae6ea33c255634fe4406b41bf9f3502efe
Change-Id: I959a2858902be421dc9adf137bf5bc22f6a152bd
2024-06-13 10:48:04 -07:00
Xin Li
77273907ed
[automerger skipped] Merge 2024-06 Release (ab/AP2A.240605.024) to aosp-main-future am: a0932dbfbe
-s ours
...
am skip reason: Merged-In I9d64aa9d5630b90286c6336dd95ef1e2c9e43910 with SHA-1 9a8f074c01
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/27554704
Change-Id: Icb3cb16f7207aec66d1508a6ce54b2b4a1332e26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-06 21:36:19 +00:00
Xin Li
a0932dbfbe
Merge 2024-06 Release (ab/AP2A.240605.024) to aosp-main-future
...
Bug: 343100748
Merged-In: I9d64aa9d5630b90286c6336dd95ef1e2c9e43910
Change-Id: I085b9bae6ea33c255634fe4406b41bf9f3502efe
2024-06-05 14:12:12 -07:00
Treehugger Robot
6fdd64025b
Merge "waves: correct config to fix wrong tuning" into main
2024-05-31 05:19:48 +00:00
Cyan_Hsieh
14275bb146
Switch makefile owners to MK_OWNERS am: 46ea9b3a35
am: 0811a1be0b
...
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/3107246
Change-Id: I416c758e094922eb83867b1f5ccc618407bd74a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-29 22:00:01 +00:00
Alice Wang
1b39ca2485
Disable AVF remote attestation on bluejay devices am: c4d47798ba
am: acd52c1113
...
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/3093345
Change-Id: Id525e3c6199877af1cd255f3e2d95fc7ffcb28d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-29 21:58:39 +00:00
Xin Li
a409c4ac5f
[automerger skipped] Merge Android 24Q2 Release (ab/11526283) to aosp-main-future am: 68780eed4b
-s ours
...
am skip reason: Merged-In I0f2eb66bc3830f68b3cfac6fdedaad6893bf538f with SHA-1 407ac994ea
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/27272633
Change-Id: I46bb8331fb6ca6dc95886349a540bdb5a74c1a33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-29 20:48:27 +00:00
Cyan_Hsieh
0811a1be0b
Switch makefile owners to MK_OWNERS am: 46ea9b3a35
...
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/3107246
Change-Id: I88e3a145988d3aca84e5a18ac3274af497f3fcb4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-29 14:29:15 +00:00
Cyan_Hsieh
46ea9b3a35
Switch makefile owners to MK_OWNERS
...
Bug: 278167548
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:9bab86ac7deaae3497b3b75ef7d3d8976ff20894 )
Merged-In: I141c255cad00dd9dcd9c3491e5bd3b18a9c9fcfd
Change-Id: I141c255cad00dd9dcd9c3491e5bd3b18a9c9fcfd
2024-05-29 10:00:04 +00:00
Jasmine Cha
a7b7acea91
waves: correct config to fix wrong tuning
...
- remove unused controls since the last version isn't expected multiple
instance.
Bug: 341323676
Test: manual test
Change-Id: I3a3c91ec742a46169cab8c57d32b5faef49603c6
Signed-off-by: Jasmine Cha <chajasmine@google.com>
2024-05-28 08:20:45 +00:00
Alice Wang
acd52c1113
Disable AVF remote attestation on bluejay devices am: c4d47798ba
...
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/3093345
Change-Id: If6e24c78ea699b8cb76fa26cd58ebb19c7d4d85d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-27 08:57:17 +00:00
Alice Wang
c4d47798ba
Disable AVF remote attestation on bluejay devices
...
The VM DICE chain support required by AVF remote
attestation is only introduced from Pixel 7.
Bug: 341292601
Test: run VM remote attestation on Pixel 6 and check it is
disabled
Change-Id: I820fdd2b9d84986a30350606eca805668d007997
2024-05-23 14:09:18 +00:00
Treehugger Robot
23adb2f602
Merge "audio: remove unused device" into main
2024-05-23 08:02:05 +00:00
Sam Ou
0fbebce97f
Merge "thermal: Remove SOFT_OCP related tzones" into main
2024-05-21 12:28:55 +00:00
Ravi Jain
776f029243
Merge "Vibrator: Set Soong Config variable - kernel_ver" into main
2024-05-20 11:00:38 +00:00
Ravi Jain
3d6495dc82
Vibrator: Set Soong Config variable - kernel_ver
...
Bug: 340148508
Test: Build and check fw files in all devices.
Change-Id: I43f1a3211423abe39d8e28559440d1a8b4b94b4a
2024-05-20 06:51:08 +00:00
Wei Wang
4840116c4d
Merge "Adpf:bluejay: enable heuristic boost." into main
2024-05-17 07:07:39 +00:00
guibing
17721a2719
Adpf:bluejay: enable heuristic boost.
...
Heuristic boost will adjust the ADPF boost profile when the
powerhal detects the power session is very janky, providing more
boost for deadline sensitive threads managed in the session.
Bug: 341111433
Test: adb shell dumpsys android.hardware.power.IPower/default;
check the device adpf sessions' traces.
Change-Id: Ia581a9578b16356ea7529230e13832dea3129531
2024-05-16 18:55:44 +00:00
Cyan Hsieh
0ae4995d23
Merge "Update bootloader pdk folder and soong config" into main
2024-05-15 14:01:34 +00:00
samou
f02bdc5c2f
thermal: Remove SOFT_OCP related tzones
...
Bug: 337976702
Test: Confirm boot
Change-Id: I06e168898cea7580a666d7c81abb845b615fbf23
Signed-off-by: samou <samou@google.com>
2024-05-15 11:47:06 +00:00
Treehugger Robot
a5db32f653
Merge "gps: Reduce logging mask" into main
2024-05-13 01:50:58 +00:00
Cheng Chang
1b33bad9d2
gps: Reduce logging mask
...
Bug: 267729515
Bug: 312716075
Test: Verification for logging system.
Test: Verification at b/267729515#comment152
Change-Id: I7522585e3810daf4b544bb9acef78ddd01fcb295
2024-05-10 03:43:48 +00:00
Xin Li
68780eed4b
Merge Android 24Q2 Release (ab/11526283) to aosp-main-future
...
Bug: 337098550
Merged-In: I0f2eb66bc3830f68b3cfac6fdedaad6893bf538f
Change-Id: I0b6d2f41f985bbbd07667b030efedcc62804fcbe
2024-05-06 12:09:14 -07:00
Cyan_Hsieh
cf0bf3a40a
Update bootloader pdk folder and soong config
...
Bug: 333834221
Change-Id: Ie8e4a8afe5b0386646b31dba32a107248be70acb
2024-05-06 16:40:18 +08:00
Qian-Hao Huang
1a07b1edc7
Load fips140.ko before all other kernel modules
...
Bug: 337838109
Bug: 331791671
Change-Id: I823169ea48db8cfdc4c7755e62861de0020887d0
Signed-off-by: Qian-Hao Huang <qhhuang@google.com>
2024-05-02 13:16:27 +00:00
Matt Buckley
795e93a20e
Merge "Add POWER_EFFICIENCY uclamp max to adpf config" into main
2024-04-29 19:42:15 +00:00
Carter Hsu
7c1707228c
audio: remove unused device
...
Bug: 337191827
Test: build pass
Change-Id: I6bc3d745dabe5ff8aeca6ad56d74d3c001e1087f
Signed-off-by: Carter Hsu <carterhsu@google.com>
2024-04-27 01:43:34 +08:00
Thomas Girardier
fbf8573174
Merge "Revert "[Bluetooth] Disable BT auto on feature"" into main
2024-04-26 04:02:59 +00:00
Thomas Girardier
6e8bf98d40
Revert "[Bluetooth] Disable BT auto on feature"
...
Revert submission 26919210-BTAUTOOFF4389
Reason for revert: Auto On has been approved for 24Q3
Reverted changes: /q/submissionid:26919210-BTAUTOOFF4389
Change-Id: I45576bc88502a9e42a5af4bb55b4624a4c76e2e8
2024-04-25 16:21:17 +00:00
Cyan_Hsieh
a390f107ef
Switch bootloader directory to control by build flag
...
Bug: 333834221
Change-Id: I6512d22d6d615f39a9f497ef7bc1ee3bc686eb01
2024-04-18 15:35:00 +08:00
Cyan Hsieh
0fe9a4d77f
Merge "Branch bootloader prebuilts for 24Q3 release" into main
2024-04-18 06:12:48 +00:00
Charles Yo
746de0eee4
Merge "Switch default kernel directory and change build flag naming" into main
2024-04-16 01:34:49 +00:00
Cyan_Hsieh
4ec979e798
Switch default kernel directory and change build flag naming
...
Bug: 309749142
Change-Id: I43eef055d8ff15ae71f1dcb8e78385378234a6ac
2024-04-12 17:38:11 +08:00
Barry
dfef42eaf0
[Bluetooth] Disable BT auto on feature
...
Set bluetooth.server.automatic_turn_on false for disable Bluetooth Auto
On feature
Bug: 333830114
Test: make
Change-Id: I51710920158bee1f291262ed73a664cd1de3067e
2024-04-11 15:07:43 +00:00
Cyan_Hsieh
1278fc7ffc
Branch bootloader prebuilts for 24Q3 release
...
Bug: 326002225
Change-Id: I6f75f77ae21fedb4a124159ec0a8d2a3225d1f91
2024-04-11 06:45:29 +00:00
Jimmy Shiu
f731f0c7f9
powerhint: set ADPF CPU_LOAD_UP CPU_LOAD_RESET values am: 9edb9e7c67
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/26905139
Change-Id: I206577e9f9ef5037af5a7bae0d284664754cb61f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-10 16:37:23 +00:00
Jimmy Shiu
9edb9e7c67
powerhint: set ADPF CPU_LOAD_UP CPU_LOAD_RESET values
...
Bug: 329483662
Test: Manual Test
Change-Id: I7ff73a5552bb8ccae39a52bf259be8b2eeafccc3
2024-04-10 11:45:05 +00:00
Ankur Bakshi
9eca0f9de1
Merge "Update bluejay SVN to 62" into main
2024-04-05 02:13:25 +00:00
Jimmy Shiu
8c56fb2e06
powerhint: set uclampmin_init value for applying CPU Load boost am: 0d1122b2e9
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/26809490
Change-Id: I33f83ec37a4ff2292470eac0662b314adceabbc3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-03 04:19:43 +00:00
Jimmy Shiu
0d1122b2e9
powerhint: set uclampmin_init value for applying CPU Load boost
...
Bug: 329483662
Test: Manual Test
Change-Id: Id882cc213befc89f75af6b64c241fbc66e2eec25
2024-04-03 01:04:48 +00:00
Ankur Bakshi
e1fef93f63
Update bluejay SVN to 62
...
Bug: 330382848
Change-Id: Iae4ad013a81459411eac77c9486ecc8411e0b9b1
2024-03-28 15:28:59 +00:00
Android Build Coastguard Worker
2c611bad7b
Merge cherrypicks of ['googleplex-android-review.googlesource.com/26243174', 'googleplex-android-review.googlesource.com/26242507', 'googleplex-android-review.googlesource.com/26244092', 'googleplex-android-review.googlesource.com/26465284'] into 24Q2-release.
...
Change-Id: I61d26bb70bf888c46e1b6a7bfec50bfe52c0ba7e
2024-03-26 23:37:33 +00:00
Ankur Bakshi
ab2d50ac00
Update bluejay SVN to 61
...
Bug: 325156176
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:9a8f074c0140915dfd0948d0d0663458e72ad3f0 )
Merged-In: I9d64aa9d5630b90286c6336dd95ef1e2c9e43910
Change-Id: I9d64aa9d5630b90286c6336dd95ef1e2c9e43910
2024-03-26 23:24:13 +00:00
Ankur Bakshi
2fa60b0106
Update bluejay SVN to 60
...
Bug: 325156176
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:cc1a8946436212346ed46d92c45ce046ce6b84bd )
Merged-In: I4b8eb00b66dbc3f794f1678b5d5edcfea5fd49b3
Change-Id: I4b8eb00b66dbc3f794f1678b5d5edcfea5fd49b3
2024-03-26 23:23:58 +00:00
Ankur Bakshi
c90c7d32a7
Update bluejay SVN to 59
...
Bug: 325156176
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:8b3b8cfbb484ac7a1b504cf4b9ea4df29b5c0aff )
Merged-In: Ia7c000f30bb7d19830c83596e9dda76f91debb28
Change-Id: Ia7c000f30bb7d19830c83596e9dda76f91debb28
2024-03-26 23:23:41 +00:00
Ankur Bakshi
41f94a4ab9
Update bluejay SVN to 58
...
Bug: 325156176
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:6c243941ba9cbe0835f377f6a95ed1d29e90c94f )
Merged-In: I2b77dc5a7ddeb6e082710a2515ea1a3398d1fe58
Change-Id: I2b77dc5a7ddeb6e082710a2515ea1a3398d1fe58
2024-03-26 23:23:24 +00:00
Ankur Bakshi
9a8f074c01
Update bluejay SVN to 61
...
Bug: 325156176
Change-Id: I9d64aa9d5630b90286c6336dd95ef1e2c9e43910
2024-03-21 21:43:45 +00:00
Android Build Coastguard Worker
000a3eca76
Merge cherrypicks of ['googleplex-android-review.googlesource.com/26014701'] into 24Q2-release.
...
Change-Id: Id0c9b007842344e821289555f517d2915f38e9f6
2024-03-20 21:30:07 +00:00