Treehugger Robot
1b6df46381
Merge "Update SOONG_NAMESPACES to include power-anomaly-sitril folder" into main
2024-03-28 04:59:30 +00:00
Android Build Coastguard Worker
93e292bba3
Snap for 11629448 from 336cc78bd9
to 24Q3-release
...
Change-Id: Ib67f14d788e7daddfb348a9c9aed64b4ce3427fa
2024-03-27 01:04:37 +00:00
Android Build Coastguard Worker
6a6766d878
Merge cherrypicks of ['android-review.googlesource.com/3009648'] into 24Q2-release.
...
Change-Id: I13b9f2ca30340a6b5a11d590106d3200d9dd4d46
2024-03-26 23:37:01 +00:00
Jack Wu
956405c6c0
Update health AIDL HAL to V3
...
Bug: 328327545
Test: TH
Test: vts-tradefed run vts -m vts_treble_vintf_vendor_test
Signed-off-by: Jack Wu <wjack@google.com>
(cherry picked from https://android-review.googlesource.com/q/commit:40f89b2d464071389d395f39928ef0e6d99bf2fb )
Merged-In: I7582ba278abcb30cebe041f775efe45633a58bad
Change-Id: I7582ba278abcb30cebe041f775efe45633a58bad
2024-03-26 23:19:37 +00:00
Vilas Bhat
336cc78bd9
Merge "16k: zuma: Remove PRODUCT_MAX_PAGE_SIZE_SUPPORTED, set to 16384 by default" into main am: 9f46e1bc8a
am: 19eefd7be5
...
Original change: https://android-review.googlesource.com/c/device/google/zuma/+/3009017
Change-Id: I18dcbc4200bbded295cbf3084a6c2c54d3a49a69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-26 00:58:45 +00: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
Herbert Xue
f655891870
Update SOONG_NAMESPACES to include power-anomaly-sitril folder
...
Bug: 326175117
Test: lunch husky-trunk_staging-userdebug && m PowerAnomalySitril
Change-Id: Icdaf363a37c29d9bc7b07b3ee552440fa723f80d
2024-03-25 16:11:14 +08:00
Android Build Coastguard Worker
672de8fd30
Snap for 11617975 from 4f08475886
to 24Q3-release
...
Change-Id: I6d2397b900639a9852289f5a4b2531574bd61c96
2024-03-23 01:03:04 +00:00
Jack Wu
4f08475886
Update health AIDL HAL to V3 am: 40f89b2d46
am: b3ae3a6b85
...
Original change: https://android-review.googlesource.com/c/device/google/zuma/+/3009648
Change-Id: Ibfa39e6ef8eff1cf6e967226a8677b026e97aafd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-22 17:59:05 +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
Spade Lee
ea61856798
Merge "pixelstats: zuma: add history validation path" into main
2024-03-22 07:30:31 +00:00
Wesley Lee
2aff27d3e4
Merge "Adjust 720P and below performance point" into main
2024-03-21 23:18:15 +00:00
Android Build Coastguard Worker
d5d9ed7547
Snap for 11610847 from e723942c69
to 24Q3-release
...
Change-Id: Ifdaa2160dbadd311dba111fe8d13859f656612f7
2024-03-21 23:03:13 +00:00
Wesley Lee
b80719b25f
Adjust 720P and below performance point
...
Bug: 325950790
Change-Id: I3038b4056819e55fff9171f809ff66d6ada969ab
Signed-off-by: Wesley Lee <szuweilee@google.com>
2024-03-21 10:15:50 -07:00
Oleg Blinnikov
e723942c69
Merge "persist.sys.hdcp_checking controls max hdcp" into main
2024-03-21 12:21:30 +00:00
Chris Lu
3a14c951a2
zuma: upgrade IDisplay to V11
...
Bug: 307787644
Test: build pass
Change-Id: I538f57a0d67f9e8d248e8a1d46e4be46889f0d42
2024-03-21 07:30:11 +00:00
Oleg Blinnikov
3248117d06
persist.sys.hdcp_checking controls max hdcp
...
Change-Id: Ibe2554019449b6f958fc6e0168ae0deccc9f589d
Bug: 321344894
Test: set persist.sys.hdcp_checking, check the file is updated
2024-03-20 11:10:41 +00:00
Android Build Coastguard Worker
80a8bb82bb
Snap for 11597038 from 45dbae1b7a
to 24Q3-release
...
Change-Id: I57b35dcbf82e3c703b7c7312bc6282319a964607
2024-03-19 23:03:37 +00:00
RD Babiera
523717b768
usb: handle displayport debounce timer empty reads
...
If the device is unplugged then plugged before
mDisplayPortDebounceTimer triggers, then the new
displayPortPollWork could process the trigger
in the intial epoll handling loop. Because the
timer can be rearmed, the timerfd read results
in -EAGAIN because no data is ready, but stale
data was ready to begin with.
Disarm the debounce timer when displayPortPollWork
closes to prevent new work threads from reading
timer when not ready. Also log debounce read
errors as a warning and not an error.
Test: manual test on device
Bug: 328553922
(cherry-picked from 94c9c1ac86f398c22ddc446f17bd7ab3fddb675c)
Change-Id: Icf3dbe929eb9f0520941a4efe3dcea79a71d46c3
Signed-off-by: RD Babiera <rdbabiera@google.com>
2024-03-19 18:35:19 +00:00
Shashwat Razdan
45dbae1b7a
[automerger skipped] Adding android.software.contextualsearch to zuma devices. am: df92ac07bd
-s ours
...
am skip reason: Merged-In I4ee1ecd9e292d6e1807ba1f77851e53380db0a07 with SHA-1 3ceb5170ce
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/26574570
Change-Id: I564a51efb5e1dfa0e3bd84876dc500c0b9c21659
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-19 08:29:05 +00:00
Treehugger Robot
7a6899664e
Merge "zuma: Set max supported page size to 65536" into main
2024-03-19 02:09:56 +00:00
Shashwat Razdan
df92ac07bd
Adding android.software.contextualsearch to zuma devices.
...
Bug: 326143814
Test: Built and tested on device
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:3ceb5170ce03587387eaf794a4ee5d0c68540664 )
Merged-In: I4ee1ecd9e292d6e1807ba1f77851e53380db0a07
Change-Id: I4ee1ecd9e292d6e1807ba1f77851e53380db0a07
CP feature CLs to 24d1-dev
2024-03-13 23:58:37 +00:00
Android Build Coastguard Worker
5d09d2e375
Snap for 11571437 from 593127ec47
to 24Q3-release
...
Change-Id: I47d115855221d0fec9c0f5c55536779a507392ba
2024-03-13 23:03:16 +00:00
Hongyang Jiao
593127ec47
Merge "Add betterbug.mk to zuma" into main
2024-03-13 04:30:07 +00:00
Spade Lee
a4b4967c03
pixelstats: zuma: add history validation path
...
Bug: 329174074
Change-Id: Ia134e6b6b8dc0c9db35bcf36bed700b67466f353
Signed-off-by: Spade Lee <spadelee@google.com>
2024-03-13 02:00:22 +00:00
Chungro Lee
c0f9207cf5
pixelstats: move learning/model load path to sysfs
...
Reporting learning(relaxation) and model loading once a day
* learning and model loading path moved from uevent to
sysfs collector.
Bug: 329124192
Change-Id: I91039ce3a8ee4630a76113ef7ae6be3bc6908f64
Signed-off-by: Chungro Lee <chungro@google.com>
2024-03-13 01:29:18 +00:00
Android Build Coastguard Worker
e361427f05
Merge cherrypicks of ['googleplex-android-review.googlesource.com/26450008'] into 24Q2-release.
...
Change-Id: I28ec471aba80fab9378bbf5835d92c2589496c09
2024-03-08 23:58:33 +00:00
Daniel Chapin
1e0c02c5de
Revert "Add betterbug mk to zuma"
...
Revert submission 26348985-bb-sepolicy-poc
Reason for revert: Droidfood blocking bug: b/327991669
Bug: b/327991669
Reverted changes: /q/submissionid:26348985-bb-sepolicy-poc
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:fe980182cc8f21d7af154271d58aff971f72132c )
Merged-In: I83de6f389e4ce5113afd751871e0e10e67fb0b4f
Change-Id: I83de6f389e4ce5113afd751871e0e10e67fb0b4f
2024-03-08 23:54:55 +00:00
Android Build Coastguard Worker
2b5f4cc3be
Snap for 11545716 from 329687e7b5
to 24Q3-release
...
Change-Id: I9390e25fe92de507a16135fd7a36b0228ea5e6ef
2024-03-08 00:03:09 +00:00
Android Build Coastguard Worker
8a9faf7829
Merge cherrypicks of ['googleplex-android-review.googlesource.com/26469535'] into 24Q2-release.
...
Change-Id: I3c5a5010d1a3044beaed4fa101ad3b266513696f
2024-03-07 20:57:34 +00:00
Shashwat Razdan
07f89b88fc
Adding android.software.contextualsearch to zuma devices.
...
Bug: 326143814
Test: Built and tested on device
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:3ceb5170ce03587387eaf794a4ee5d0c68540664 )
Merged-In: I4ee1ecd9e292d6e1807ba1f77851e53380db0a07
Change-Id: I4ee1ecd9e292d6e1807ba1f77851e53380db0a07
2024-03-07 20:52:02 +00:00
Xin Li
329687e7b5
[automerger skipped] Merge Android 14 QPR2 to AOSP main am: 9410b32a49
-s ours am: 51173b9d7a
-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: I3bef0bebcd271340ccedbd7e5db1ae2b9bd9bfa2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-07 10:46:30 +00: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
Android Build Coastguard Worker
3d1fb4197f
Snap for 11540345 from 791a68939f
to 24Q3-release
...
Change-Id: I49e09f7b237f717c2b34c7df546c4950aff91334
2024-03-07 01:52:56 +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
Shashwat Razdan
791a68939f
Merge "Adding android.software.contextualsearch to zuma devices." into main
2024-03-06 16:33:04 +00:00
Shashwat Razdan
3ceb5170ce
Adding android.software.contextualsearch to zuma devices.
...
Bug: 326143814
Test: Built and tested on device
Change-Id: I4ee1ecd9e292d6e1807ba1f77851e53380db0a07
2024-03-05 23:46:52 -08:00
Android Build Coastguard Worker
dfe9f3e3a8
Snap for 11533280 from 738d2aa5db
to 24Q3-release
...
Change-Id: I080c2da96a6f735caaadc54c1387f7c60eb8537c
2024-03-06 00:03:14 +00:00
Hongyang Jiao
590a555cb9
Add betterbug.mk to zuma
...
Test: manual test
Bug: 322543833
Change-Id: Ibd314393d11b2552b79a7f73cd7ed888e08934b2
2024-03-05 23:30:04 +00:00
Bart Sears
738d2aa5db
Merge "Revert "Add betterbug mk to zuma"" into main
2024-03-05 20:38:11 +00:00
Daniel Chapin
fe980182cc
Revert "Add betterbug mk to zuma"
...
Revert submission 26348985-bb-sepolicy-poc
Reason for revert: Droidfood blocking bug: b/327991669
Bug: b/327991669
Reverted changes: /q/submissionid:26348985-bb-sepolicy-poc
Change-Id: I83de6f389e4ce5113afd751871e0e10e67fb0b4f
2024-03-05 20:37:25 +00:00
Treehugger Robot
3cfbf4bec2
Merge "Add media.c2 aidl fragments" into main
2024-03-05 06:17:02 +00:00
Mark Chang
f1794b994b
Merge "Add sepolicy include to zuma." into main
2024-03-05 05:31:47 +00:00
Treehugger Robot
1793e986cc
Merge "Move Gralloc packages to gs-common" into main
2024-03-04 22:13:55 +00:00
Android Build Coastguard Worker
c41b83d6bf
Snap for 11520864 from ad60710ab1
to 24Q3-release
...
Change-Id: I931f5f67abef4f3910ce4e82bc454e8b72ec9785
2024-03-02 02:03:41 +00:00
Android Build Coastguard Worker
3f512701c0
Snap for 11520864 from ad60710ab1
to 24Q2-release
...
Change-Id: Ice82c41ad5bf1f55dc356a3132ba9254b022dcb8
2024-03-02 02:03:28 +00:00
AleX Pelosi
ad60710ab1
Merge "pixelstats: added multiple GMSR paths" into main
2024-03-01 03:14:41 +00:00