Xin Li
de7209e8a0
Merge SQ3A.220605.009
...
Bug: 236045730
Merged-In: I6ebabb9d53028a05950d7d00c34ffdf33fb8ff2f
Change-Id: I7baa7d362aab400eefab4e1a833a31cd3798d118
2022-06-16 22:42:57 -07:00
Xin Li
d9fce352ad
[automerger skipped] Merge Android 12 QPR 3 am: b03bfa6ccf
-s ours am: b6ef0dc62f
-s ours
...
am skip reason: Merged-In I42565f0acc744669c6c335543a6f1470ad326d4e with SHA-1 42cc5cd651
is already in history
Original change: https://android-review.googlesource.com/c/device/google/gs101/+/2126014
Change-Id: I9b2b1d5a5629caaf75a04416517b123a5c6c54ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-17 00:14:20 +00:00
Android Build Coastguard Worker
1e1492e397
Snap for 8735997 from 079810e65b
to tm-release
...
Change-Id: Ia615c20d61d281b3586a1b7b340600fee8a22a24
2022-06-16 23:11:15 +00:00
Xin Li
b6ef0dc62f
[automerger skipped] Merge Android 12 QPR 3 am: b03bfa6ccf
-s ours
...
am skip reason: Merged-In I42565f0acc744669c6c335543a6f1470ad326d4e with SHA-1 42cc5cd651
is already in history
Original change: https://android-review.googlesource.com/c/device/google/gs101/+/2126014
Change-Id: If4a9406c9249ce27322f3d9d753ae979c46064e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-16 19:57:13 +00:00
Ruofei Ma
c323e40a4d
Revert "update performance-point for media performance class 13" am: 079810e65b
am: e1121f430a
am: 92c3560f24
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18904119
Change-Id: Ie0fe3690c82f52d3fcf8396f4372e7253da3cdef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-16 19:37:38 +00:00
Ruofei Ma
dbf05f0650
Revert "update performance-point for media performance class 13" am: 079810e65b
am: ab062f9fc3
am: c6c107ca6d
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18904119
Change-Id: I3009a1dd10ecb22fdabdf8bc044b76b0f1c5088d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-16 19:37:33 +00:00
Ruofei Ma
af56e1caff
Revert "update performance-point for media performance class 13" am: 079810e65b
am: ab062f9fc3
am: 21445f3149
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18904119
Change-Id: Ieba119e100bad0aa1dc160a7f3ff2e750ea4b1ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-16 19:37:09 +00:00
Ruofei Ma
92c3560f24
Revert "update performance-point for media performance class 13" am: 079810e65b
am: e1121f430a
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18904119
Change-Id: I7ac2fd7621fa9bd1d4d3eb0eb17f7e15e63ea9eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-16 18:15:18 +00:00
Ruofei Ma
c6c107ca6d
Revert "update performance-point for media performance class 13" am: 079810e65b
am: ab062f9fc3
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18904119
Change-Id: I00290c601a1252731968acda6c0583d78eba26bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-16 18:15:15 +00:00
Ruofei Ma
21445f3149
Revert "update performance-point for media performance class 13" am: 079810e65b
am: ab062f9fc3
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18904119
Change-Id: I0df8e688a7f85209cf967d265eb503ea2c1673f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-16 18:15:11 +00:00
Ruofei Ma
ab062f9fc3
Revert "update performance-point for media performance class 13" am: 079810e65b
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18904119
Change-Id: If563b6aa25bd8ddd0a0fa251dc777ccde2a95f7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-16 17:48:55 +00:00
Ruofei Ma
e1121f430a
Revert "update performance-point for media performance class 13" am: 079810e65b
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18904119
Change-Id: Id689b6ebd4cdd35ade025c2baceeeb477b8325c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-16 17:47:19 +00:00
Ruofei Ma
079810e65b
Revert "update performance-point for media performance class 13"
...
This reverts commit 53eef4db82
.
Reason for revert: We do not need to support media performance class 13 for P21 devices and this change is causing regression in P21 so we have to revert it.
Bug: 235027936
Change-Id: I51099b94ac635e001cd56dd6cd250b1b8e0bd9f4
2022-06-16 17:26:14 +00:00
Terry Huang
6b8df55282
Enable Google Audio RIL library in PDK am: 944f48c3db
am: fdcd49b12d
am: 42b6c8f4eb
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18596144
Change-Id: I719d6ebbbf025f58c9b90e7bd91b9a4265f577eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-16 02:00:34 +00:00
Terry Huang
98ff1c950f
Enable Google Audio RIL library in PDK am: 944f48c3db
am: fc5d85dace
am: b6dbe69613
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18596144
Change-Id: Id036f7a20012d999b048fb21b070647bbb5ef92a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-16 02:00:23 +00:00
Terry Huang
4086c44d25
Enable Google Audio RIL library in PDK am: 944f48c3db
am: fc5d85dace
am: 93835b1085
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18596144
Change-Id: Ia4d2b1dadcb5c890997e2c7600f6f3de06f11903
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-16 02:00:07 +00:00
Terry Huang
42b6c8f4eb
Enable Google Audio RIL library in PDK am: 944f48c3db
am: fdcd49b12d
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18596144
Change-Id: I22e2b365912caba05eb9ecaceb3bf1e724354fc0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-16 01:44:51 +00:00
Terry Huang
b6dbe69613
Enable Google Audio RIL library in PDK am: 944f48c3db
am: fc5d85dace
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18596144
Change-Id: Ia77a841a5986c0adefe8eb2900836213766b909e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-16 01:44:07 +00:00
Terry Huang
93835b1085
Enable Google Audio RIL library in PDK am: 944f48c3db
am: fc5d85dace
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18596144
Change-Id: I71d2faaa07652e9c052c5916c48e32802056c947
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-16 01:43:56 +00:00
Terry Huang
fc5d85dace
Enable Google Audio RIL library in PDK am: 944f48c3db
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18596144
Change-Id: I69bc8e3127874215c2bb340c70669d4a9b769a40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-16 01:19:21 +00:00
Terry Huang
fdcd49b12d
Enable Google Audio RIL library in PDK am: 944f48c3db
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18596144
Change-Id: Ica89bd4b6b6310bd1fcf19edaf21590261a24332
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-16 01:17:19 +00:00
Terry Huang
944f48c3db
Enable Google Audio RIL library in PDK
...
Bug: 233831048
Test: libgooglerilaudio is built in PDK ROM
Change-Id: I395b3b16ff967f46fe2163dde5655c31344bcbe5
2022-06-16 00:53:42 +00:00
Xin Li
b03bfa6ccf
Merge Android 12 QPR 3
...
Bug: 236045730
Merged-In: I42565f0acc744669c6c335543a6f1470ad326d4e
Change-Id: I6bdaaa95e15701057feb53924cf74f5d5a28b651
2022-06-14 16:40:14 -07:00
Android Build Coastguard Worker
45296b8b36
Snap for 8721292 from 09abcc2eab
to tm-release
...
Change-Id: I3ff4c070396458a0eabd8e3514b8ff9015be025b
2022-06-14 23:02:08 +00:00
Edwin Tung
eb5dd1dc2c
gps: update gps driver 143.20.23.540442 am: 09abcc2eab
am: 0681d1541c
am: e2f4436f4c
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18842531
Change-Id: Icea748e07639b3fd6ce19cf8d7aaeec43df9ac74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-14 17:33:28 +00:00
Edwin Tung
2df4ee0aa3
gps: update gps driver 143.20.23.540442 am: 09abcc2eab
am: 66f2c1c47f
am: 5b192b4b73
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18842531
Change-Id: Ic028fbdd7f51b7af3275ca9e73d73ec57c7c39ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-14 17:31:59 +00:00
Edwin Tung
59c4e095af
gps: update gps driver 143.20.23.540442 am: 09abcc2eab
am: 66f2c1c47f
am: 15b90a7955
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18842531
Change-Id: I72e578fcfa863e18b0719baa803403b512884363
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-14 17:31:02 +00:00
Edwin Tung
e2f4436f4c
gps: update gps driver 143.20.23.540442 am: 09abcc2eab
am: 0681d1541c
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18842531
Change-Id: I60bf8787cddce232afc1d2fbd5fa610fb1387fb0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-14 17:17:37 +00:00
Edwin Tung
5b192b4b73
gps: update gps driver 143.20.23.540442 am: 09abcc2eab
am: 66f2c1c47f
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18842531
Change-Id: Iac55d618a31efe2c6c7b9057a194984fb71ea64d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-14 17:16:17 +00:00
Edwin Tung
15b90a7955
gps: update gps driver 143.20.23.540442 am: 09abcc2eab
am: 66f2c1c47f
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18842531
Change-Id: I7f39c1aba9d1600934ff1ecc37aa2cc74f725349
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-14 17:16:03 +00:00
Edwin Tung
66f2c1c47f
gps: update gps driver 143.20.23.540442 am: 09abcc2eab
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18842531
Change-Id: I44ecb8fc4031435dc605170f068ae47ddd955b03
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-14 16:56:29 +00:00
Edwin Tung
0681d1541c
gps: update gps driver 143.20.23.540442 am: 09abcc2eab
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18842531
Change-Id: Ib382d6095e9b1fa04e35176fd93033f493fb4b5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-14 16:49:47 +00:00
Jack Wu
b8adde1c94
init: disable dock-defend in charger mode am: 4a612faaaf
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18816148
Change-Id: I4fbd838e75edf3770cf38971fdbfc7b8cdc24b98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-14 05:25:55 +00:00
Jack Wu
4a612faaaf
init: disable dock-defend in charger mode
...
Need to meet energy certification test requirement which needs to
be able to charge FULL.
Bug: 235437635
Test: can charge to full on dock in charger mode
Signed-off-by: Jack Wu <wjack@google.com>
Change-Id: I9f92cffdefbeef8e3671812dbc2891d4fef71230
2022-06-14 11:00:53 +08:00
Edwin Tung
09abcc2eab
gps: update gps driver 143.20.23.540442
...
Disable OTDOA in Android TM and fix SUPL OTDOA B66 issue
Keep IGnssCallback when gps off to fix DBH issue
Fix measurement interval issue
Fix SI/NI SUPL connection timing issue
Bug: 233849643
Bug: 233839493
Bug: 231383525
Bug: 228575547
Verify test: 235753507
Test: atest VtsHalGnssTargetTest
atest CtsLocationGnssTestCases
atest PtsChreTestCases
Change-Id: I986dd08b8e25d60f90f04baa9b8b19a8ee5d493f
2022-06-13 02:32:43 +00:00
Oleg Matcovschi
fbfe4757d9
thermal: enable warm_reset on thermal shutdown am: 8afd9f90c1
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18824394
Change-Id: Id0f09c4876f66ae90a38a7dcba2292f47664469f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-10 17:03:47 +00:00
Oleg Matcovschi
8afd9f90c1
thermal: enable warm_reset on thermal shutdown
...
Bug: 232092738
Signed-off-by: Oleg Matcovschi <omatcovschi@google.com>
Change-Id: I04ee37682b3511e9836248d0527917f00deb63f4
2022-06-10 01:51:43 +00:00
Android Build Coastguard Worker
9cdc73ddfa
Snap for 8704672 from b4854aa4bb
to tm-release
...
Change-Id: I24c0a80ae02d6400f6620e1a1c9120ae477078c1
2022-06-10 00:59:07 +00:00
Zac Iqbal
90f8cf5677
Revert "DO NOT MERGE Remove unintended face config am: 875235afbf
" am: e973ddc480
am: 7bcbd8c608
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18819342
Change-Id: Ief26a9469d62a2bfc3723585437f8c1c2c5524f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09 22:27:47 +00:00
Zac Iqbal
44250fb118
Revert "DO NOT MERGE Remove unintended face config am: 875235afbf
" am: e973ddc480
am: a1410edaac
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18819342
Change-Id: Ida7097cccfd72dd3c95f2ae61a639237847682bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09 22:27:21 +00:00
Zac Iqbal
7bcbd8c608
Revert "DO NOT MERGE Remove unintended face config am: 875235afbf
" am: e973ddc480
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18819342
Change-Id: I97cb882bfba9841054c632d87c6228708f1d41fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09 21:58:52 +00:00
Zac Iqbal
a1410edaac
Revert "DO NOT MERGE Remove unintended face config am: 875235afbf
" am: e973ddc480
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18819342
Change-Id: I193bd92568e2da008e04240b1039b34b27f1aa84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09 21:58:50 +00:00
Zac Iqbal
e973ddc480
Revert "DO NOT MERGE Remove unintended face config am: 875235afbf
"
...
Revert submission 18799414-am-e98f52416a40436ba0044e72d6feed21
Reason for revert: The merge path was only meant for tm-dev.
Reverted Changes:
I6ace51cab:DO NOT MERGE Remove faceauth from raven am: 783e56...
I049a9c205:DO NOT MERGE Remove unintended face config am: 875...
I50ae185c6:DO NOT MERGE Remove unintended faceauth configs am...
Change-Id: I0b0c885ecb47e94d3327c7436d61b07a58c999d5
2022-06-09 21:30:24 +00:00
Ken Huang
48addae66c
Revert "dumpstate: add HWC logs" am: b4854aa4bb
am: 2e62723ff9
am: 9f2416da32
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18798909
Change-Id: I5da0785b7c7707417b7c29b0cc98f5fa3c026a65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09 10:43:42 +00:00
Ken Huang
b4f724462b
Revert "dumpstate: add HWC logs" am: b4854aa4bb
am: 79693249ff
am: fc82cbe715
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18798909
Change-Id: I73afb9796c6d2bef7ae316a8a321df64920299ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09 10:43:31 +00:00
Ken Huang
e2e97f32fd
Revert "dumpstate: add HWC logs" am: b4854aa4bb
am: 79693249ff
am: c930a63e7b
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18798909
Change-Id: Ic290c8d4fd3d400172942cc8bcae3b4026e77c46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09 10:43:25 +00:00
Ken Huang
9f2416da32
Revert "dumpstate: add HWC logs" am: b4854aa4bb
am: 2e62723ff9
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18798909
Change-Id: I406435f0481045256be89a6f0dbc87e6dcea64e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09 09:08:33 +00:00
Ken Huang
fc82cbe715
Revert "dumpstate: add HWC logs" am: b4854aa4bb
am: 79693249ff
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18798909
Change-Id: I315c0f0bdb04ebef2b119671997d04f4735ed5b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09 09:08:24 +00:00
Ken Huang
c930a63e7b
Revert "dumpstate: add HWC logs" am: b4854aa4bb
am: 79693249ff
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18798909
Change-Id: Id471db49eb16334f48c261366b98f703b300cbf2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09 09:08:23 +00:00
Ken Huang
79693249ff
Revert "dumpstate: add HWC logs" am: b4854aa4bb
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18798909
Change-Id: Ib1952b6c39b11b5a0ac438a6a0888b2a660daddb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09 08:10:30 +00:00