Commit graph

2428 commits

Author SHA1 Message Date
Cyan_Hsieh
86e9f51a58 Switch makefile owners to MK_OWNERS
Bug: 278167548
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:621df82f7af10ff85fa290af75c729f734cb2938)
Merged-In: I7c3083ad4d881334c6f8f78d89b6a31fcd46c42e
Change-Id: I7c3083ad4d881334c6f8f78d89b6a31fcd46c42e
2024-05-29 10:00:58 +00:00
Treehugger Robot
fca2c9d122 Merge "Update USES_LASSEN_MODEM soong config settings for aosp projects." into main 2024-04-29 09:25:56 +00:00
Herbert Xue
34b4efdcc8 Update USES_LASSEN_MODEM soong config settings for aosp projects.
Add the flag "use_lassen_modem" for bp to do the same checking like
"USES_LASSEN_MODEM" in mk.

Bug: 330654744
Test: 1. lunch aosp_cheetah-trunk_staging-userdebug
      2. m RilConfigService
Change-Id: I4ef0fe469e98fa6315896bbe8c422f741e207664
2024-04-29 16:26:24 +08:00
Vilas Bhat
9f46e1bc8a Merge "16k: zuma: Remove PRODUCT_MAX_PAGE_SIZE_SUPPORTED, set to 16384 by default" into main 2024-03-26 00:11:12 +00:00
Vilas Bhat
2c6de7bc7a 16k: zuma: Remove PRODUCT_MAX_PAGE_SIZE_SUPPORTED, set to 16384 by default
b/300367402 has been resolved and PRODUCT_MAX_PAGE_SIZE_SUPPORTED
override is not needed anymore as the default value is set to 16384.

Bug: 310232825
Bug: 300367402
Change-Id: I0a319a2ede0897bcde97214c70ebf099062bac0d
2024-03-26 00:06:22 +00:00
Jack Wu
40f89b2d46 Update health AIDL HAL to V3
Bug: 328327545
Test: TH
Test: vts-tradefed run vts -m vts_treble_vintf_vendor_test
Change-Id: I7582ba278abcb30cebe041f775efe45633a58bad
Signed-off-by: Jack Wu <wjack@google.com>
2024-03-22 21:38:07 +08:00
Xin Li
9410b32a49 Merge Android 14 QPR2 to AOSP main
Bug: 319669529
Merged-In: I32eb36d69c485eaab1d138a6271e08660bfe39b0
Change-Id: Ie1a388e0381897e4b0522ffad710449f9ad465e4
2024-03-06 09:29:51 -08:00
Xin Li
b3d1357a39 Merge Android 24Q1 Release (ab/11220357)
Bug: 319669529
Merged-In: I473ac38a5f7b1540aea0b4588bc358f6855ff4b3
Change-Id: I32eb36d69c485eaab1d138a6271e08660bfe39b0
2024-01-17 22:13:21 -08:00
Evgenii Stepanov
39414bb2f9 Revert "Force disable MTE in Chrome in _fullmte build." am: ff0cc4d3f4
Original change: https://android-review.googlesource.com/c/device/google/zuma/+/2896760

Change-Id: I3cccd277d35cc0324f49bf865981638ae0af19ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-04 01:31:22 +00:00
Evgenii Stepanov
ff0cc4d3f4 Revert "Force disable MTE in Chrome in _fullmte build."
This reverts commit 4a1f9459e5.

The Chrome issue has been fixed upstread and this workaround is no
longer needed; in fact, it triggers another issue where conflicting MTE
mode settings make newer Chrome versions crash at startup.

Bug: 297266100
Bug: 305005339
Bug: https://crbug.com/1515053
Test: chrome still does not crash; debuggerd shows MTE is enabled (grep
for TCF_MTE)

Change-Id: Iee2b704c4ea39b5809193c1ceed3b8f41618dd40
2024-01-03 16:10:25 -08:00
Snehal Koukuntla
25a875d403 Merge "Add trusty code coverage controller daemon" into main 2023-12-14 05:15:11 +00:00
Treehugger Robot
e1e8933703 Merge "powerstats: change TPU DVFS data source from ACPM to TPU kernel" into main 2023-12-13 07:10:57 +00:00
Treehugger Robot
da04c1d607 Merge "init: make dumpstate able to read display logbuffer" into main 2023-12-13 07:09:39 +00:00
Snehal
e871979054 Add trusty code coverage controller daemon
Bug: 289523068

Change-Id: I473ac38a5f7b1540aea0b4588bc358f6855ff4b3
2023-12-13 06:53:12 +00:00
Ken Lin
425a781cd1 init: make dumpstate able to read display logbuffer
Add logbuffer support for display driver to dump DSI cmd

Bug: 291441544
Test: adb root; adb shell dumpsys
android.hardware.dumpstate.IDumpstateDevice/default dump_display_logbuffer
Change-Id: I74eaa7b3cdd8101909044f173512d41b065a2599
Signed-off-by: Ken Lin <lyenting@google.com>
2023-12-13 06:13:04 +00:00
Darren Hsu
3c8118e0f8 powerstats: change TPU DVFS data source from ACPM to TPU kernel
ACPM has an issue b/315079424 that reports incorrect TPU DVFS
residency. So change the data source from ACPM to TPU kernel.

Bug: 310094590
Test: vts-tradefed run vts -m VtsHalPowerStatsTargetTest
Change-Id: If4bdaeea510b1a8e72d057a7fbb0dc03f6a6c665
Signed-off-by: Darren Hsu <darrenhsu@google.com>
2023-12-12 23:20:13 +08:00
YK Hung
ed808b4425 Merge "Grant the post notification permission to Turbo" into main 2023-12-12 10:21:08 +00:00
Kuen-Han Tsai
c6c1954a28 Merge "usb: enable media-presence polling for SD cards" into main 2023-12-12 08:06:15 +00:00
Wesley Wang
838d9245c0 Grant the post notification permission to Turbo
Bug: 293813663
Test: manual and local build verify
Change-Id: I9ae27af828b1eeb2b8c2e2397a94e74f2315298a
2023-12-12 14:21:41 +08:00
Kuen-Han Tsai
559da7282a usb: enable media-presence polling for SD cards
After USB enumeration, some SD card readers do not send signals to the
device when the SD card is inserted or removed.

To support SD card hotplugging, this patch enables in-kernel
media-presence polling, which will check the SD card status every 2
seconds after a SD card reader is attached.

Bug: 186479576
Test: SD card insertion/removal and data copy (see b/301566595)
Change-Id: I044aeffd9386c0bee6138402e5130c39e1adbc9f
Signed-off-by: Kuen-Han Tsai <khtsai@google.com>
2023-12-12 14:11:31 +08:00
Hungyen Weng
8caeeb3811 config: Use carrier config in ROM by default am: 06e99301dd am: 6a0f8557ef
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/25616149

Change-Id: Ifb518f5fffe10ade5ffcd9df412a767feedaa53d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-12 05:46:05 +00:00
Hungyen Weng
6a0f8557ef config: Use carrier config in ROM by default am: 06e99301dd
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/25616149

Change-Id: I3eb4c0748edaee4a93e156eb6d9c8f2a40a60ae4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-12 05:12:00 +00:00
Xin Li
1b45f49762 [automerger skipped] Merge Android 14 QPR1 am: 3db3ce96a7 -s ours am: ca4d830813 -s ours am: ccb168aa86 -s ours
am skip reason: Merged-In I12add8918fb1922029cbbee130be33a3a36e44a4 with SHA-1 8dadca19cf is already in history

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

Change-Id: I8535f81cadead59df772a39ca12c7e67c321b5bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11 22:57:38 +00:00
Xin Li
ccb168aa86 [automerger skipped] Merge Android 14 QPR1 am: 3db3ce96a7 -s ours am: ca4d830813 -s ours
am skip reason: Merged-In I12add8918fb1922029cbbee130be33a3a36e44a4 with SHA-1 8dadca19cf is already in history

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

Change-Id: Ib0634058959d578b4362dc2740c6532e55b39f6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11 22:02:25 +00:00
Xin Li
ca4d830813 [automerger skipped] Merge Android 14 QPR1 am: 3db3ce96a7 -s ours
am skip reason: Merged-In I12add8918fb1922029cbbee130be33a3a36e44a4 with SHA-1 8dadca19cf is already in history

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

Change-Id: I7554252880002165eead6431b0b4ef12c2ee9756
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11 21:16:35 +00:00
Hungyen Weng
06e99301dd config: Use carrier config in ROM by default
Bug: 314890118

Test: Flash ROM and confirm the carrier config follows the ROM.
Change-Id: Iffdb9a3a53e82d86d9917d84a7ce6ac49a3bad2a
2023-12-11 11:24:09 -08:00
Will McVicker
9f7b7c532d [automerger skipped] fstab: allow unlocked devices to boot with AVB test key am: b832cc86c7 -s ours am: d99ce52b7a -s ours am: bc07227536 -s ours
am skip reason: skipped by user willmcvicker

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

Change-Id: I3b5dcd4e5723fa87ed648d772fa0879ae1d6ef1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-09 08:59:22 +00:00
Will McVicker
bc07227536 [automerger skipped] fstab: allow unlocked devices to boot with AVB test key am: b832cc86c7 -s ours am: d99ce52b7a -s ours
am skip reason: skipped by user willmcvicker

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

Change-Id: I2715ce19c1eec0768919fe8362ad4e6a85a77869
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-09 08:25:26 +00:00
Will McVicker
d99ce52b7a [automerger skipped] fstab: allow unlocked devices to boot with AVB test key am: b832cc86c7 -s ours
am skip reason: skipped by user willmcvicker

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

Change-Id: I07980e0ed1770697e0ed10aeb35978a8136bb8a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-09 07:55:48 +00:00
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