Xin Li
6e66838065
[automerger skipped] Merge Android 13 QPR3 tm-qpr-dev-plus-aosp-without-vendor@9936994 am: 18699a77fa
-s ours
...
am skip reason: Merged-In Ic737349bdfb9e8342730ceef0da5308e443bfc1e with SHA-1 50bba290a6
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/22722391
Change-Id: Iee00f1dbbd62bd984d426b81d2fca511d27c4723
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21 18:16:14 +00:00
Bruno BELANYI
9802c0e5a5
Define mali configuration path explicitly
...
This avoids mali trying to read `/data/data/com.mali.testjava` for its
debug config.
Bug: b/205779871
Test: manual - reboot device and check the absence of AVC denials
Change-Id: Ib741cb37c418b4601109c4d75c25373a110ca231
2023-04-21 08:12:55 +00:00
Ian Elliott
340df28e93
gs101: Use SkiaVk as RenderEngine backend am: 6968365b28
am: 10932aab91
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/22560943
Change-Id: I710cf446d4749ee7f54ac94988ba095cbb0bc4b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-20 04:28:50 +00:00
Ian Elliott
8bf2c28ab4
gs101: Use SkiaVk as RenderEngine backend am: 6968365b28
am: 7fe2310530
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/22560943
Change-Id: I861167ce3017e205ed09f6fc5267f02ab2decc97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-20 04:28:12 +00:00
Ian Elliott
10932aab91
gs101: Use SkiaVk as RenderEngine backend am: 6968365b28
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/22560943
Change-Id: I573d8702a2ce3debb06dcf4c358a3c58ce6a8759
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-20 03:52:03 +00:00
Ian Elliott
7fe2310530
gs101: Use SkiaVk as RenderEngine backend am: 6968365b28
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/22560943
Change-Id: I78307aa06507ca71bf7dbd39475e1cb35e769b49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-20 03:51:42 +00:00
Ian Elliott
6968365b28
gs101: Use SkiaVk as RenderEngine backend
...
Re-enabling after fixing critical bug (b/274419744).
Using SkiaVk saves boot-time memory (b/276962658).
Test: no issues seen after enabling on Pixel 7 Pro
Bug: 274419744
Bug: 276962658
Bug: 236390072
Change-Id: Iad0ff2a0bbde894724672b5b56846a8da005dde0
2023-04-20 03:04:32 +00:00
Xin Li
18699a77fa
Merge Android 13 QPR3 tm-qpr-dev-plus-aosp-without-vendor@9936994
...
Bug: 275386652
Merged-In: Ic737349bdfb9e8342730ceef0da5308e443bfc1e
Change-Id: Id0f708d28f530d2f90fcb2066fbab7bba4fba4b5
2023-04-18 16:32:07 -07:00
Automerger Merge Worker
82fb153d72
Merge "gs101: update media_codecs_performance_c2.xml based on UP1A.230417.001 am: 659e456597
am: b0214cd8bc
"
2023-04-18 17:32:21 +00:00
Jerry Huang
7773222bc4
gs101: update media_codecs_performance_c2.xml based on UP1A.230417.001 am: 659e456597
am: 93032aa8e8
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/22698085
Change-Id: I03d0947b97b1d261698a68b7086e605b73cabd95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-18 17:32:11 +00:00
Jerry Huang
a3b8141992
gs101: update media_codecs_performance_c2.xml based on UP1A.230417.001 am: 659e456597
am: b0214cd8bc
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/22698085
Change-Id: I5f1f1a9a4e1b84abab9f66d98fdfe8cf30d83169
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-18 17:32:09 +00:00
Automerger Merge Worker
b0dd35884a
Merge "gs101: Cover pvmfw.img in vbmeta_system.img am: 39764125a4
am: 58e4e47b5b
am: b5d827efcd
am: 853d8de12b
am: e5a6cc1886
"
2023-04-18 17:31:45 +00:00
Pierre-Clément Tosi
df435ee197
gs101: Cover pvmfw.img in vbmeta_system.img am: 39764125a4
am: 58e4e47b5b
am: b5d827efcd
am: 853d8de12b
am: e5a6cc1886
...
Original change: https://android-review.googlesource.com/c/device/google/gs101/+/2543390
Change-Id: I236942c7544dd2ce2ee13317c0ba381c90d916c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-18 17:31:34 +00:00
Pierre-Clément Tosi
53b1fb1468
gs101: Cover pvmfw.img in vbmeta_system.img am: 39764125a4
am: 58e4e47b5b
am: b5d827efcd
am: 853d8de12b
am: 6d567befa1
...
Original change: https://android-review.googlesource.com/c/device/google/gs101/+/2543390
Change-Id: Id3bfa61d541aa27c1619994593266a6852029599
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-18 17:31:22 +00:00
Jerry Huang
93032aa8e8
gs101: update media_codecs_performance_c2.xml based on UP1A.230417.001 am: 659e456597
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/22698085
Change-Id: Ib7179b829bb73d97f2bae99a5b09c880382652f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-18 17:00:41 +00:00
Jerry Huang
b0214cd8bc
gs101: update media_codecs_performance_c2.xml based on UP1A.230417.001 am: 659e456597
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/22698085
Change-Id: Iab16d82572ce79410a91e53138d732eb0915724d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-18 16:59:40 +00:00
Pierre-Clément Tosi
e5a6cc1886
gs101: Cover pvmfw.img in vbmeta_system.img am: 39764125a4
am: 58e4e47b5b
am: b5d827efcd
am: 853d8de12b
...
Original change: https://android-review.googlesource.com/c/device/google/gs101/+/2543390
Change-Id: I4547f5dc8282e15ae773c7b75c8121d2b00a1c7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-18 16:57:57 +00:00
Pierre-Clément Tosi
6d567befa1
gs101: Cover pvmfw.img in vbmeta_system.img am: 39764125a4
am: 58e4e47b5b
am: b5d827efcd
am: 853d8de12b
...
Original change: https://android-review.googlesource.com/c/device/google/gs101/+/2543390
Change-Id: I9d585ffdeafdb37d55f7b4537f6f36866247a36e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-18 16:56:58 +00:00
Jerry Huang
659e456597
gs101: update media_codecs_performance_c2.xml based on UP1A.230417.001
...
- add sw decoder performance measure result from DVT device
Bug: 275148623
Test: run cts -m CtsMediaDecoderTestCases -a arm64-v8a -t android.media.decoder.cts.VideoDecoderPerfTest
Change-Id: Ib839a12585393dc1dd07ed4f71632603bcc9b74b
2023-04-18 16:29:35 +00:00
Pierre-Clément Tosi
853d8de12b
gs101: Cover pvmfw.img in vbmeta_system.img am: 39764125a4
am: 58e4e47b5b
am: b5d827efcd
...
Original change: https://android-review.googlesource.com/c/device/google/gs101/+/2543390
Change-Id: I39a6692988911e3de79ee8691640d4be7e01b72a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-18 15:50:34 +00:00
Pierre-Clément Tosi
b5d827efcd
gs101: Cover pvmfw.img in vbmeta_system.img am: 39764125a4
am: 58e4e47b5b
...
Original change: https://android-review.googlesource.com/c/device/google/gs101/+/2543390
Change-Id: Id35258d6975d53d544921c204b2a2a43f2c00981
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-18 15:06:21 +00:00
Pierre-Clément Tosi
58e4e47b5b
gs101: Cover pvmfw.img in vbmeta_system.img am: 39764125a4
...
Original change: https://android-review.googlesource.com/c/device/google/gs101/+/2543390
Change-Id: I2a7491948b522dd8829cbd3f60aa6ab7d2e2297c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-18 14:20:37 +00:00
Pierre-Clément Tosi
39764125a4
gs101: 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: I03f10699859ec8079ef2e2e4177f6cfa7f83d6d6
2023-04-18 11:27:39 +01:00
Shuibing Dai
223dd3aeb9
Enable updating country code from scan results for generic case am: b2bb140b1f
am: 89d0974988
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/22636816
Change-Id: I038709a85bb0f21a5d95103015d7e9f1065b1e59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-17 16:56:04 +00:00
Shuibing Dai
cf93d03833
Enable updating country code from scan results for generic case am: b2bb140b1f
am: da5bc0ee6d
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/22636816
Change-Id: I72b9bb530f878a3d1b17eb70758a59ffc74a137d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-17 16:55:23 +00:00
Shuibing Dai
da5bc0ee6d
Enable updating country code from scan results for generic case am: b2bb140b1f
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/22636816
Change-Id: I376454f5030eb9c5776f85f83535ffb2b76a9782
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-17 16:13:45 +00:00
Shuibing Dai
89d0974988
Enable updating country code from scan results for generic case am: b2bb140b1f
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/22636816
Change-Id: I863a8fd2ae7375bba6d65166ba068142632d248b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-17 16:13:40 +00:00
Shuibing Dai
b2bb140b1f
Enable updating country code from scan results for generic case
...
Bug: 271928725
Bug: 267944733
Test: manually test
Change-Id: I6f1f0ce3afdf203812965ede07422f454566f33d
2023-04-17 15:46:24 +00:00
wenchangliu
7771ec0390
Update media_codecs_performance_c2.xml base on UP1A.230414 am: 5b7374adf4
am: a89805b007
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/22673327
Change-Id: I7203c9a20049f50b858bbaf7fc86e388766775e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-17 11:56:55 +00:00
wenchangliu
53f5232295
Update media_codecs_performance_c2.xml base on UP1A.230414 am: 5b7374adf4
am: 6ca5fe42a3
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/22673327
Change-Id: I84317bc61e711da12c44d6a4d4fdbb34ed2ffcda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-17 11:55:46 +00:00
wenchangliu
6ca5fe42a3
Update media_codecs_performance_c2.xml base on UP1A.230414 am: 5b7374adf4
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/22673327
Change-Id: I38992f0b19ed7555a0bf6d220f92eb592e0ae6f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-17 11:29:39 +00:00
wenchangliu
a89805b007
Update media_codecs_performance_c2.xml base on UP1A.230414 am: 5b7374adf4
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/22673327
Change-Id: I5b35450972c27913f7c2277370029534ca13c094
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-17 11:29:11 +00:00
wenchangliu
5b7374adf4
Update media_codecs_performance_c2.xml base on UP1A.230414
...
- add sw av1 encoder performance measure result from PVT device
Bug: 271510425
Test: run cts -m CtsVideoTestCases -t android.video.cts.VideoEncoderDecoderTest
Change-Id: I26515dd7d38f2e5c9fcfcf3abc0fbdffec342784
2023-04-17 08:23:09 +00:00
wenchangliu
2adac39dd1
Update same maximum resolution capability for hevc am: 6a062f176d
am: bd925aaccf
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/22603984
Change-Id: Ia8947e9b73912adbf8fd22c9ace0dcb1ac9f2424
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-14 03:46:16 +00:00
wenchangliu
5198cee185
Update same maximum resolution capability for hevc am: 6a062f176d
am: af5747f108
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/22603984
Change-Id: I7ef2b6be7100212bc1d1f98e6e2dfc5de1d93903
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-14 03:45:47 +00:00
wenchangliu
af5747f108
Update same maximum resolution capability for hevc am: 6a062f176d
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/22603984
Change-Id: Ifd80bb48c1ffac87ca7f7ed804f9d9a3ea729a3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-14 03:14:55 +00:00
wenchangliu
bd925aaccf
Update same maximum resolution capability for hevc am: 6a062f176d
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/22603984
Change-Id: I37cd523f41d3407a4c3942b36bc8d45be49194bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-14 03:14:09 +00:00
wenchangliu
6a062f176d
Update same maximum resolution capability for hevc
...
Bug: 275024348
Test: atest android.videocodec.cts.VideoEncoderMinMaxTest
Change-Id: Ic3a1a31ebced2ede8e377494f3fc64e721a9a864
2023-04-14 02:37:11 +00:00
Adam Shih
46bb2e7c7c
add missing comment am: ae8663e544
am: 571e4284f0
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/22610179
Change-Id: I7389613dce4f59055c6cd02a49fc2b8ad89e71a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13 07:39:42 +00:00
Adam Shih
87cd49382d
add missing comment am: ae8663e544
am: 38676d744d
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/22610179
Change-Id: I1ac3282097fb8e70d6fa84e1c6b5d0abdafdec62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13 07:39:35 +00:00
Adam Shih
38676d744d
add missing comment am: ae8663e544
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/22610179
Change-Id: If44bbd30236e7c5cf73ebbec6b7e9f6a5db1f845
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13 07:11:49 +00:00
Adam Shih
571e4284f0
add missing comment am: ae8663e544
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/22610179
Change-Id: Ic084b44a98806604bc21ecb9a2ca093ac71bc3ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13 07:11:45 +00:00
Adam Shih
ae8663e544
add missing comment
...
Bug: 278006689
Test: adb bugreport
Change-Id: I2def5f7b6a96beb61ab2fec0f7bbb0cfbe097dd2
2023-04-13 13:36:52 +08:00
Treehugger Robot
c828875769
[automerger skipped] Merge "Merge TQ2A.230405.003" am: 4a03b2a928
am: bad450009f
-s ours am: 2cd0f22d5b
-s ours am: cb15c18038
-s ours am: f4c219b3eb
-s ours
...
am skip reason: Merged-In I46ec45354ae72a6a758aba2c2a31af92f1da4038 with SHA-1 ca61a1318a
is already in history
Original change: https://android-review.googlesource.com/c/device/google/gs101/+/2528181
Change-Id: Ie3ab3c1defec402f07cfe4a3f0bed6a3c4c0981f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13 03:34:30 +00:00
Treehugger Robot
25e8e0dc71
[automerger skipped] Merge "Merge TQ2A.230405.003" am: 4a03b2a928
am: bad450009f
-s ours am: 2cd0f22d5b
-s ours am: cb15c18038
-s ours am: b1cc337988
-s ours
...
am skip reason: Merged-In I46ec45354ae72a6a758aba2c2a31af92f1da4038 with SHA-1 ca61a1318a
is already in history
Original change: https://android-review.googlesource.com/c/device/google/gs101/+/2528181
Change-Id: Id0c5857b3056b0d147da040e553321c12de71cbf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13 02:55:02 +00:00
Treehugger Robot
b1cc337988
[automerger skipped] Merge "Merge TQ2A.230405.003" am: 4a03b2a928
am: bad450009f
-s ours am: 2cd0f22d5b
-s ours am: cb15c18038
-s ours
...
am skip reason: Merged-In I46ec45354ae72a6a758aba2c2a31af92f1da4038 with SHA-1 ca61a1318a
is already in history
Original change: https://android-review.googlesource.com/c/device/google/gs101/+/2528181
Change-Id: I18bafa5f0e086fae53e96bba93d321479fc3dbaf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12 21:13:19 +00:00
Treehugger Robot
f4c219b3eb
[automerger skipped] Merge "Merge TQ2A.230405.003" am: 4a03b2a928
am: bad450009f
-s ours am: 2cd0f22d5b
-s ours am: cb15c18038
-s ours
...
am skip reason: Merged-In I46ec45354ae72a6a758aba2c2a31af92f1da4038 with SHA-1 ca61a1318a
is already in history
Original change: https://android-review.googlesource.com/c/device/google/gs101/+/2528181
Change-Id: Ib53ceab77bcb07773b9768f6f6f361dc3a2e08b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12 21:08:40 +00:00
Treehugger Robot
cb15c18038
[automerger skipped] Merge "Merge TQ2A.230405.003" am: 4a03b2a928
am: bad450009f
-s ours am: 2cd0f22d5b
-s ours
...
am skip reason: Merged-In I46ec45354ae72a6a758aba2c2a31af92f1da4038 with SHA-1 ca61a1318a
is already in history
Original change: https://android-review.googlesource.com/c/device/google/gs101/+/2528181
Change-Id: Ieb2123bc42a016d704ec1271b230a9c6b9fdf954
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12 20:57:07 +00:00
Treehugger Robot
2cd0f22d5b
[automerger skipped] Merge "Merge TQ2A.230405.003" am: 4a03b2a928
am: bad450009f
-s ours
...
am skip reason: Merged-In I46ec45354ae72a6a758aba2c2a31af92f1da4038 with SHA-1 ca61a1318a
is already in history
Original change: https://android-review.googlesource.com/c/device/google/gs101/+/2528181
Change-Id: Ic93141d1a55c24cca3e096a29044eec2f9729040
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12 20:22:54 +00:00
Treehugger Robot
bad450009f
Merge "Merge TQ2A.230405.003" am: 4a03b2a928
...
Original change: https://android-review.googlesource.com/c/device/google/gs101/+/2528181
Change-Id: I4783f09e7c1e557da282dfa2fb02f8e0b0fd0fa6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12 19:00:55 +00:00