Commit graph

942 commits

Author SHA1 Message Date
Petri Gynther
d5eb0bcf97 Merge udc-dp-dev into udc-d1-dev
Merge DisplayPort feature code into udc-d1-dev.

Bug: 272184398
Change-Id: I4bf8359ec57f378a92e95ca12de3849d0c5e93eb
2023-04-24 16:22:41 -07:00
RD Babiera
de9bbc84db Merge "usb: Fix HAL build warnings related to DisplayPort" into udc-dp-dev 2023-04-24 22:21:22 +00:00
Minchan Kim
edaa462b44 Merge "remove alloc_contig_dump_pages for CMA failure" into udc-d1-dev am: 1bb58a26ec
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/22816750

Change-Id: I0afa9f162655c904e3ab4d168895be0af1966473
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24 22:13:55 +00:00
RD Babiera
4e29924d3d usb: Fix HAL build warnings related to DisplayPort
Adds proper error handling go-to points to remove warnings arising
from uninitialized variables, and removes unused
queryDisplayPortStatus() method.

Test: manual test on device, verify compiler warnings
Bug: 278951278
Change-Id: I54f7b710a0805b32c894d741e473d64814200134
2023-04-24 21:45:17 +00:00
Minchan Kim
1bb58a26ec Merge "remove alloc_contig_dump_pages for CMA failure" into udc-d1-dev 2023-04-24 21:32:30 +00:00
Minchan Kim
9b0eb78455 remove alloc_contig_dump_pages for CMA failure
We have enough debugging tool now so remove the option.

Bug: 264334863
Test: confirmed from /proc/cmdline
Change-Id: Ia79e07ec159f05604c8e431e6753a79f749350a1
Signed-off-by: Minchan Kim <minchan@google.com>
2023-04-24 10:56:56 -07:00
Cyan Hsieh
5d5329c01c Merge "Add device mk OWNERS" into udc-d1-dev am: 7baee76236
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/22746630

Change-Id: Ia9b8199d1bb2fd0c7d34f242df1f1602abc402b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24 06:32:23 +00:00
Cyan Hsieh
7baee76236 Merge "Add device mk OWNERS" into udc-d1-dev 2023-04-24 06:01:46 +00:00
Treehugger Robot
05b9201e22 Merge "Revert "Revert "zuma: Enable SICD after boot""" into udc-d1-dev am: 19230e8ea7
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/22775880

Change-Id: I038083d0a641fcd7b6974c4b9f4ca408782bdb5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21 06:50:11 +00:00
Treehugger Robot
bc25fecc8e Merge "add Dolby codec config to zuma" into udc-d1-dev am: 9128fc3508
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/22762557

Change-Id: I01a9ffab8ddbe431deb5da460758cda95d19ed2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21 06:49:36 +00:00
Treehugger Robot
19230e8ea7 Merge "Revert "Revert "zuma: Enable SICD after boot""" into udc-d1-dev 2023-04-21 06:38:33 +00:00
Ankit Goyal
4b880759a2 Add memtrack
Bug: 279108265
Test: dumpsys meminfo
Change-Id: I9615e8e4a5484bf6c24a4cfc32a8489f6e2b24ba
2023-04-20 23:19:51 -07:00
Treehugger Robot
9128fc3508 Merge "add Dolby codec config to zuma" into udc-d1-dev 2023-04-21 06:15:28 +00:00
Jack Wu
66354c3b90 Set current date as activation date after device being provisioned am: 59304c995a
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/22660800

Change-Id: Ib5233acc08abd8accb23fbacc868144ab1fcf64c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21 04:43:14 +00:00
Mahesh Sivasubramanian
785167e0d3 Revert "Revert "zuma: Enable SICD after boot""
This reverts commit ac3b5c0cf5.

Reason for revert: Issue addressed by disabling write evicts during core wakeup

Bug: 278308279
Change-Id: Ib5c979483a9e28074345443158860f12f6e7ace2
2023-04-21 12:35:40 +08:00
Yung Ti Su
45902335e1 add Dolby codec config to zuma
Bug: 270286386
Test: manual

Change-Id: I22c2d24e709e13ed540ba9a796cb26d670abe7cf
Signed-off-by: Yung Ti Su <andysu@google.com>
2023-04-21 11:22:43 +08:00
Jack Wu
59304c995a Set current date as activation date after device being provisioned
This is only applied when the device is locked.

Bug: 275441997
Test: set the date of first usage successfully
Change-Id: I1037d673422cd198007bb13f8311b993fd5132db
Signed-off-by: Jack Wu <wjack@google.com>
2023-04-21 02:10:07 +00:00
GOOGLE\huangaustin
84cf85b2b1 [P23][Logging] Update format for mask with enabling LTE_RLC group on P23 mask for MCS am: a1a0096c5c
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/22755996

Change-Id: I482395d5ddcb042d83eb8433d5249fa074348320
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-20 19:57:01 +00:00
Cyan_Hsieh
30c37471e2 Add device mk OWNERS
Bug: 278167548
Change-Id: I278b665c25df60cbd6beb0c7b9ea2fad53aecd5f
2023-04-20 18:46:23 +08:00
GOOGLE\huangaustin
a1a0096c5c [P23][Logging] Update format for mask with enabling LTE_RLC group on P23 mask for MCS
bug: 278021042
Change-Id: Ib84b9112486fd4aa290759feb966edddce4789bf
(cherry picked from commit 4490f093f162e4b448fa937b7c075592b3fa142d)
2023-04-20 03:37:10 +00:00
Cyan Hsieh
6ef12ab1dd Merge "Update ro.soc.model" into udc-d1-dev am: 972438d110
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/22609288

Change-Id: I1225892923ca585a4d1e1f82577429eadfab10c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-19 05:17:01 +00:00
Cyan Hsieh
972438d110 Merge "Update ro.soc.model" into udc-d1-dev 2023-04-19 04:18:48 +00:00
Treehugger Robot
129f13871e Merge "zuma: update media_codecs_performance_c2.xml based on UD1A.230417.001" into udc-d1-dev am: 686234658c
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/22706250

Change-Id: I4e0de9ded89cb9cc9758cb2d3d6544752a89d5d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-18 18:04:29 +00:00
Mahesh Sivasubramanian
0a8f79e67f Revert "zuma: Enable SICD after boot" am: ac3b5c0cf5
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/22713248

Change-Id: Ia1a80d1c4fda35198c0b281c8aadcdaeaf901f98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-18 18:04:08 +00:00
Kyle Zhang
64995780e8 Merge "Include widevine apex" into udc-d1-dev am: 8263af96ce
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/22602999

Change-Id: I0b5b14356dd5e9a7ae85be9d56612019e120bb7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-18 18:03:31 +00:00
Treehugger Robot
686234658c Merge "zuma: update media_codecs_performance_c2.xml based on UD1A.230417.001" into udc-d1-dev 2023-04-18 17:31:26 +00:00
Mahesh Sivasubramanian
ac3b5c0cf5 Revert "zuma: Enable SICD after boot"
This reverts commit 5cb0ef1f4a.

Reason for revert: http://b/270965383

Bug: 278308279
Bug: 270965383
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:0493c3a35bc69efae46e2dc4ada7c3db53733d4a)
Merged-In: I9bf853c11cb5335306c701d9fd19b4ae72517985
Change-Id: I9bf853c11cb5335306c701d9fd19b4ae72517985
2023-04-18 17:29:55 +00:00
Kyle Zhang
8263af96ce Merge "Include widevine apex" into udc-d1-dev 2023-04-18 17:29:11 +00:00
Pierre-Clément Tosi
293f4c8966 Merge "zuma: Cover pvmfw.img in vbmeta_system.img" into udc-d1-dev am: bd421d1624
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/22707021

Change-Id: I8deb6e52565110d8834ae6b4a772e997dc52cba8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-18 16:54:38 +00:00
Pierre-Clément Tosi
bd421d1624 Merge "zuma: Cover pvmfw.img in vbmeta_system.img" into udc-d1-dev 2023-04-18 16:17:34 +00:00
Pajace Chen
a93ae7b3ed Allow BatteryWidget to show bluettooh devices am: 125c7d0880
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/22694667

Change-Id: If349a87fbb4252c03e21633f9fa0351e0c311ef2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-18 15:51:36 +00:00
Pierre-Clément Tosi
ee129d98fa zuma: Cover pvmfw.img in vbmeta_system.img
The pvmfw partition is expected to be kept in sync with the system
partition so, instead of having it as a standalone partition (covered by
vbmeta.img), add it to vbmeta_system.

Bug: 275497314
Test: TH
Change-Id: I02356aa43d83c95d3671937a6a764ba6765a3d5b
2023-04-18 13:49:54 +01:00
Jerry Huang
211edd092b zuma: update media_codecs_performance_c2.xml based on UD1A.230417.001
- add sw decoder performance measure result from EVT device

Bug: 275148623
Test: run cts -m CtsMediaDecoderTestCases -a arm64-v8a -t android.media.decoder.cts.VideoDecoderPerfTest
Change-Id: I33e54a16c61ba019b399e696d0cca395caaecab7
2023-04-18 20:47:59 +08:00
Cyan_Hsieh
404d910909 Update ro.soc.model
Bug: 275145204
Change-Id: I01d821b7aa44a622b7e6e0e9cb6e4d099bfed018
2023-04-18 07:30:27 +00:00
Pajace Chen
125c7d0880 Allow BatteryWidget to show bluettooh devices
- Pregrant BLUETOOTH_CONNECT for settingsintelligence for Bramble,
  redin, and Barbet

Test: NA
Bug: 277269994
Change-Id: I9131eb1a0449254cb2b30d35146bdae5858e4ca6
2023-04-18 13:05:11 +08:00
RD Babiera
cc50d99508 usb: provide usb reference to DisplayPort shutdown thread
Passes usb object reference to thread creation of
mDisplayPortShutdownHelper so that it can properly call DisplayPort
shutdown method instead of calling on NULL reference.

Test: manual test on device
Bug: 278395605
Change-Id: Ie4dabb5e3ae9065f57cc0fbf2593fbe399097472
2023-04-17 22:43:31 +00:00
Wen Chang Liu
967e042adf Merge "Update media_codecs_performance_c2.xml base on UD1A.230413" into udc-d1-dev am: 9598121b5b
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/22639641

Change-Id: I2b1b15639ea7e31476f9ef160c5b6a17809db950
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-17 03:45:09 +00:00
Treehugger Robot
1bcddef85f Merge "adjust watermark level" into udc-d1-dev am: 054d139611
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/22624716

Change-Id: I5fa242e9f4db5689bb047065bcafdfdd0bc65a4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-17 03:45:00 +00:00
Wen Chang Liu
9598121b5b Merge "Update media_codecs_performance_c2.xml base on UD1A.230413" into udc-d1-dev 2023-04-17 03:43:05 +00:00
Treehugger Robot
054d139611 Merge "adjust watermark level" into udc-d1-dev 2023-04-17 03:05:35 +00:00
Martin Liu
b8d3dd7fde adjust watermark level
Increase watermark_scale_factor to 200 to better handle
burst memory allocation.

Bug: 278075546
Test: boot
Change-Id: Iaa6fb0f45924b3d73ebd76ae8554b58047f4755a
Merged-in: Iaa6fb0f45924b3d73ebd76ae8554b58047f4755a
Signed-off-by: Martin Liu <liumartin@google.com>
2023-04-16 04:01:39 +00:00
Bruno BELANYI
d9c12f87e2 Merge "zuma: Bump deqp conformance level to 2023" into udc-d1-dev am: bfb9df260d
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/22597180

Change-Id: Iad448ed2850681f969f5169454188a3e16a416e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-14 12:17:07 +00:00
Bruno BELANYI
bfb9df260d Merge "zuma: Bump deqp conformance level to 2023" into udc-d1-dev 2023-04-14 11:41:27 +00:00
Treehugger Robot
d38193d1e4 Merge "Increases socket buffer for 5G FR2 throughput" into udc-d1-dev am: 8ea9370564
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/22609286

Change-Id: Id8144868b79085a67f61c48a4b6d43c48311f5f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-14 08:28:42 +00:00
Treehugger Robot
8ea9370564 Merge "Increases socket buffer for 5G FR2 throughput" into udc-d1-dev 2023-04-14 07:55:36 +00:00
Chung-Kai (Michael) Mei
608c697b4d Merge "devfreq: reset mif freq after boot" into udc-d1-dev am: fa3460753b
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/22521202

Change-Id: I4979805859867df40504d99f3ab28b026c79499e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-14 06:26:26 +00:00
Chung-Kai (Michael) Mei
fa3460753b Merge "devfreq: reset mif freq after boot" into udc-d1-dev 2023-04-14 05:50:39 +00:00
Treehugger Robot
4da8a6ddd8 Merge "zuma: Create folder for OTA UECap" into udc-d1-dev am: 94747b5aa7
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/22609291

Change-Id: Ie8695ea627fbffda8d0339f2e2a58fef56d139fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-14 04:02:27 +00:00
Treehugger Robot
fffa535574 Merge "Update health AIDL HAL to V2" into udc-d1-dev am: fe737aa34f
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/22618959

Change-Id: Ida32a1eafce0b337f96831540c300211d689efea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-14 04:02:17 +00:00
Treehugger Robot
94747b5aa7 Merge "zuma: Create folder for OTA UECap" into udc-d1-dev 2023-04-14 03:28:30 +00:00