Commit graph

2539 commits

Author SHA1 Message Date
Xin Li
dd443fbb75 Merge Android 24Q2 Release (ab/11526283) to aosp-main-future
Bug: 337098550
Merged-In: Ifd5f1b609c0bf5fa98677f9880bfa29496add95d
Change-Id: I15da0840ac7291b41519ae4ae82b09b3c6b5148f
2024-05-06 12:09:17 -07:00
Treehugger Robot
646464efa7 Merge "Update USES_LASSEN_MODEM soong config settings for aosp projects." into main am: fca2c9d122
Original change: https://android-review.googlesource.com/c/device/google/zuma/+/3037358

Change-Id: I34b248f1d76b8b90079f775a9c6c76bf3265fea5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-29 09:42:17 +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
19eefd7be5 Merge "16k: zuma: Remove PRODUCT_MAX_PAGE_SIZE_SUPPORTED, set to 16384 by default" into main am: 9f46e1bc8a
Original change: https://android-review.googlesource.com/c/device/google/zuma/+/3009017

Change-Id: I62eeed1a5d24504c67c9b11a8e07c4874a4c95f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-26 00:32:26 +00: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
b3ae3a6b85 Update health AIDL HAL to V3 am: 40f89b2d46
Original change: https://android-review.googlesource.com/c/device/google/zuma/+/3009648

Change-Id: Ia38afc00d2ea7b36cdb40c6500ac6ce7becb6800
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-22 17:43:36 +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
51173b9d7a [automerger skipped] Merge Android 14 QPR2 to AOSP main am: 9410b32a49 -s ours
am skip reason: Merged-In I32eb36d69c485eaab1d138a6271e08660bfe39b0 with SHA-1 b3d1357a39 is already in history

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

Change-Id: If32942ee0ddb855af378568ac6ea8be6982155fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-07 09:55:05 +00: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
AleX Pelosi
ad60710ab1 Merge "pixelstats: added multiple GMSR paths" into main 2024-03-01 03:14:41 +00:00
Hongyang Jiao
4d42550e9a Merge "Add betterbug mk to zuma" into main 2024-03-01 01:10:47 +00:00
Jenny Ho
45b0145f0c pixelstats: added multiple GMSR paths
support different project paths

Bug: 308364170
Change-Id: Ifd5f1b609c0bf5fa98677f9880bfa29496add95d
Signed-off-by: Jenny Ho <hsiufangho@google.com>
2024-02-29 02:41:05 +00:00
Rakesh Raghava
18f3b37824 Merge "Removed ImsMedia from zuma" into main 2024-02-28 11:56:49 +00:00
Mark Chang
d1247f2058 Merge "Revert "Add sepolicy include to zuma."" into main 2024-02-28 10:34:00 +00:00
Liana Kazanova
009c900677 Revert "Add sepolicy include to zuma."
Revert submission 26288713-twoshay-sepolicy-24

Reason for revert: DroidMonitor: Potential culprit for b/327235315 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.

Bug:327235315

Reverted changes: /q/submissionid:26288713-twoshay-sepolicy-24

Change-Id: I71fa628c86d239b53fdd80a7b124daf7b66e2ca0
2024-02-27 21:19:55 +00:00
David Drysdale
28a906e86a Merge "Enable Secretkeeper HAL service on zuma" into main 2024-02-27 13:06:08 +00:00
Rakesh Raghava
7cb45f2978 Removed ImsMedia from zuma
- PixelImsMedia is used in zuma, so aosp ImsMedia is removed

Bug: 325148061
Test: mm
Change-Id: Ifcb93dfa9f06c08d34a7816c2a001f7115fc3baa
2024-02-27 09:57:45 +00:00
Mark Chang
a742e2f64b Merge "Add sepolicy include to zuma." into main 2024-02-27 09:43:47 +00:00
Treehugger Robot
3e0b001d9f Merge "pixelstats: zuma: add Learning/Update/ModelLoad path" into main 2024-02-27 04:06:18 +00:00
Mark Chang
79baa6c871 Add sepolicy include to zuma.
Bug: 325422902
Test: Manual, system booted without sepolicy denied error.
Change-Id: Ife2291ac6e510321217038cdd360603a0f3e3c57
Signed-off-by: Mark Chang <changmark@google.com>
2024-02-26 11:48:13 +00:00
Chungro Lee
553b0f5504 pixelstats: zuma: add Learning/Update/ModelLoad path
Upload more FG data to analyze its trends

Bug: 317827237
Change-Id: Id6cff09063ece9c08647f01dfd92bbe2e8e29580
Signed-off-by: Chungro Lee <chungro@google.com>
2024-02-25 09:14:08 +08:00
Gaurav Sarode
1433ffe9e2 Fix properties to enable override
bug: 326659788
Test: Local build
Change-Id: I7a4d2444b83753dd3f1197b02d6003a99a526d81
2024-02-23 16:02:29 -08:00
Hongyang Jiao
32305100e2 Add betterbug mk to zuma
Bug: 322543833
Test: local test, recorded in http://shortn/_iEz9DTCHgo
Change-Id: Idd83168e4e4bea43ec88afbc0823a76e879e9674
2024-02-23 23:54:49 +00:00
David Drysdale
5375e70d96 Enable Secretkeeper HAL service on zuma
The prebuilts on `main` for zuma devices have been updated to include:
- the Secretkeeper TA in Trusty
- the ABL changes to retrieve the Secretkeeper identity pub key.

So enable the corresponding HAL service for Secretkeeper when the
relevant build flag is enabled.

Bug: 291228655
Bug: 306364873
Test: VtsSecretkeeperTargetTest on shiba
Change-Id: Ida12d0742c1e74e15e0f5606ab19cdb90afbcb2b
2024-02-21 12:37:09 +00:00
Daniel Okazaki
6f86f154f7 dumpstate: moving charger nodes to user build
Bug: 323415060
Test: adb bugreport
Change-Id: Ic40a2a19e9f94ee294d27ac1164d6d192e111660
Signed-off-by: Daniel Okazaki <dtokazaki@google.com>
2024-02-17 01:19:49 +00:00
Kalesh Singh
34c969d4c5 Merge "Revert "zuma: Set max supported page size to 65536"" into main 2024-02-14 22:34:04 +00:00
Juan Yescas
26a8491cd4 Revert "zuma: Set max supported page size to 65536"
This reverts commit 2697a88c66.

Reason for revert: b/324952273

Change-Id: I1535c2de7d9769bbad5829331092f365193fd40b
2024-02-14 17:26:55 +00:00
Treehugger Robot
d2ec488c9d Merge "Fix permissions for dp_hotplug_error_code sysfs node" into main 2024-02-14 02:48:41 +00:00
Sergey Volk
b5769ac1f1 Fix permissions for dp_hotplug_error_code sysfs node
DisplayPort kernel driver passes error code/status to hardware composer
via the dp_hotplug_error_code sysfs file. When HWC receives/consumes
the error, it will write "0" into that file to reset the error code. So
this file must be readable and writable by the HWC code running with
"system" user/group permissions.
Previously we used to set the ownership to system:system, but in order
to be more consistent with the rest of sysfs files in that directory,
we can use root:graphics instead with permissions 0664. HWC runs
under the "graphics" group, so this should allow HWC write access.

Bug: 324953626
Test: checked permissions of dp_hotplug_error_code sysfs
Change-Id: Idf65acc12d158a78565c41f4e2aea24362e2cdff
2024-02-14 00:58:35 +00:00
Juan Yescas
ce338d50ef Merge "zuma: Set max supported page size to 65536" into main 2024-02-13 21:07:50 +00:00
Mark Chang
57df3553b6 Merge "Move manifest entries to gs-common." into main 2024-02-11 23:03:59 +00:00
Richard Hsu
437d99e265 Merge "[Refactor] Include edgetpu targets in final image" into main 2024-02-09 21:55:23 +00:00
Treehugger Robot
934294ce06 Merge "add HDCP stats paths for zuma devices." into main 2024-02-09 19:29:17 +00:00
Treehugger Robot
0785446d5a Merge "[displayport-stats] add display port stats paths for zuma devices." into main 2024-02-09 09:17:34 +00:00
Juan Yescas
2697a88c66 zuma: Set max supported page size to 65536
Set the max page size on zuma devices to 65536.

Bug: 300367402
Test: readelf -Wl /system/bin/init
Change-Id: Idec552d9db4468587bf98466187c8a907142dc8e
2024-02-07 21:09:43 +00:00
Yong Zhang
514452495e Add Youtube back in MRR Small Area Detection Allowlist
Bug: 324132231
Test: Make Pixel builds to verify Allowlist
Change-Id: I7688694c0628ae4f267a7492f35c2bcd86b2544a
2024-02-07 16:53:19 +00:00
Mark Chang
6b2358ac80 Move manifest entries to gs-common.
Bug: 322914403
Bug: 323110919
Bug: 324214410
Test: build succeeds on all devices, failing tests pass.
Change-Id: Ie5d66c7849dd4610b7c20d6849238effa6b4d164
Signed-off-by: Mark Chang <changmark@google.com>
2024-02-07 13:13:39 +00:00
Joen Chen
1f5cac95bb Merge "Revert^2 "zuma: enable dynamic color mode"" into main 2024-02-06 13:58:46 +00:00
Richard Hsu
e49c9e8ee6 [Refactor] Include edgetpu targets in final image
Make the EdgeTPU targets defined in <soc>/proprietary visible by product packages included in edgetpu.mk.

Bug: 323601370

Tested:
No functionality change. Edgetpu services still work.

Change-Id: I29aa594df400d64f155f03e05094c72b8527c838
2024-02-05 16:20:31 -08:00
PODISHETTY KUMAR
d9ea492172 Revert^2 "zuma: enable dynamic color mode"
This reverts commit c249f683d0.

Reason for revert: <this is not the culprit>

Change-Id: Ifcaa4febc101676ecf4fb897e9cd32dbbc5913aa
2024-02-05 12:50:32 +00:00
PODISHETTY KUMAR
b4bb82c3db Merge "Revert "zuma: enable dynamic color mode"" into main 2024-02-05 12:30:02 +00:00
PODISHETTY KUMAR
c249f683d0 Revert "zuma: enable dynamic color mode"
This reverts commit c230a8101e.

Reason for revert: <Reason for revert: Potential culprit for b/323784378  - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.>

Change-Id: I27666c2a0a04a1f93863360aa689a5aad740d0cc
2024-02-05 06:16:03 +00:00
Joen Chen
1902209d39 Merge "zuma: enable dynamic color mode" into main 2024-02-05 04:25:55 +00:00
Leon Scroggins
59abc682bc Merge "zuma: Remove sysprop forcing renderengine to skiaglthreaded" into main 2024-02-02 14:25:30 +00:00
Petri Gynther
023610f869 zuma: enable DisplayPort on -user images
Bug: 319509617
Change-Id: I3d730f31502a8abe380f160ac394799ce44b30da
2024-01-31 11:09:19 -08:00
Joen Chen
c230a8101e zuma: enable dynamic color mode
Enable dynamic color mode to reduce the power overhead of color space
conversion when GPU composition exists.

Bug: 315787778
Test: check "dumpsys SurfaceFlinger" and state of display color service
when playing SDR/HDR video

Change-Id: Ie9e87091385ab5247141bf956fbaba3275cc6811
2024-01-31 14:52:47 +00:00
Kyle Tso
258eac3e55 Reapply "dumpstate: Search the path of TCPM psy uevent"
This reverts commit ab48b5502c.

Bug: 320613177
Bug: 322294676
Change-Id: I54ec2d5bb3bcce168607cedc2f6ce608c6dde9ef
Signed-off-by: Kyle Tso <kyletso@google.com>
2024-01-31 07:02:43 +00:00
Xin Li
5e08f65eee [automerger skipped] Merge Android 24Q1 Release (ab/11220357) am: b3d1357a39 -s ours
am skip reason: Merged-In I473ac38a5f7b1540aea0b4588bc358f6855ff4b3 with SHA-1 e871979054 is already in history

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

Change-Id: Ic02206928d9c7d418d4736972c4d1dc57df9abd6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-31 02:02:39 +00:00