Xin Li
b60d3a6ab2
[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: 351e85eedb
-s ours am: a2a50f0a27
-s ours am: 7fab844f70
-s ours
...
am skip reason: Merged-In I3765847b9c2074e1501646675fed7109a7a73230 with SHA-1 c10d805383
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/19094452
Change-Id: I866dbde4fbfdfd5e26467b86d63e78a46bfc0b7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30 00:03:00 +00:00
Xin Li
7fab844f70
[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: 351e85eedb
-s ours am: a2a50f0a27
-s ours
...
am skip reason: Merged-In I3765847b9c2074e1501646675fed7109a7a73230 with SHA-1 c10d805383
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/19094452
Change-Id: I6742c6353aef0fccc6603bb1d91462ec72da6f7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-29 22:57:20 +00:00
Xin Li
a2a50f0a27
[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: 351e85eedb
-s ours
...
am skip reason: Merged-In I3765847b9c2074e1501646675fed7109a7a73230 with SHA-1 c10d805383
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/19094452
Change-Id: I9f9392cb23326e46f68ce3f6b5328ceaea2676ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-29 22:13:47 +00:00
Xin Li
351e85eedb
Merge tm-dev-plus-aosp-without-vendor@8763363
...
Bug: 236760014
Merged-In: I3765847b9c2074e1501646675fed7109a7a73230
Change-Id: Idb4a38c1a7e263037d990ff16bbb65348ec11cf6
2022-06-27 23:37:34 +00:00
Ocean Chen
48d39f5253
Pixelstats: add block layer stats length am: 40448dc03b
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/19008849
Change-Id: I739f5d5c52f01b887b9d503d6911078b48a3fb11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 09:50:31 +00:00
Ocean Chen
40448dc03b
Pixelstats: add block layer stats length
...
The block layer stats format is changing
time by time. This can pass the correct
length by project.
Bug: 219860725
Test: reboot and check log
Change-Id: I760cf211e87fe7cc6069a2379193e61cf323ebb3
2022-06-24 09:31:10 +00:00
Automerger Merge Worker
db6fc7d22d
Merge "uwb: update calibration path for GS101 am: bfd1212cf9
am: 7ce62ae61f
" into tm-qpr-dev-plus-aosp
2022-06-23 19:14:03 +00:00
Rex Lin
7d4792254c
uwb: update calibration path for GS101 am: bfd1212cf9
am: 7ce62ae61f
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/19008851
Change-Id: I6e02260c5101e010842207a0368eee670112be6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-23 19:13:49 +00:00
Rex Lin
8767cd77fe
uwb: update calibration path for GS101 am: bfd1212cf9
am: fb38288849
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/19008851
Change-Id: I538dfe53048d1e96ac8ec177a92d1df2ddf54a6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-23 19:13:32 +00:00
Rex Lin
7ce62ae61f
uwb: update calibration path for GS101 am: bfd1212cf9
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/19008851
Change-Id: If3ebb6a8973a86c0e30c54f934613483e4036910
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-23 18:58:34 +00:00
Rex Lin
fb38288849
uwb: update calibration path for GS101 am: bfd1212cf9
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/19008851
Change-Id: Ie5cf3a9438514cb6ba9d66da03c8900bf55d6cb4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-23 18:58:32 +00:00
Rex Lin
bfd1212cf9
uwb: update calibration path for GS101
...
Bug: 233619860
Test: Build pass
Signed-off-by: Rex Lin <rexcylin@google.com>
Change-Id: Ief35d7c1f464dfed7416eea28d3f0a2caed81e55
2022-06-23 18:38:40 +00:00
Daeho Jeong
335e551c91
fstab: disable auto compression for apk,apex and so am: c10d805383
am: 489cd831f2
am: 45a2cdc56b
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18931177
Change-Id: I421da16b19090e42405401743c2779d44f99244d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-21 22:33:48 +00:00
Daeho Jeong
55b65f1495
fstab: disable auto compression for apk,apex and so am: c10d805383
am: db1b0654d9
am: a442c576f6
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18931177
Change-Id: Ib4e1aa73ae3c30070fb60933e16319907f86b6b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-21 22:33:09 +00:00
Daeho Jeong
ee5cffc734
fstab: disable auto compression for apk,apex and so am: c10d805383
am: 489cd831f2
am: eb703a418c
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18931177
Change-Id: I7221b7c0042ae45fdc5d90e8918b3f03163f9705
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-21 22:32:48 +00:00
Daeho Jeong
45a2cdc56b
fstab: disable auto compression for apk,apex and so am: c10d805383
am: 489cd831f2
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18931177
Change-Id: Ie7ee76ada4a505d91eac4386efa37d31f84cd35a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-21 22:08:54 +00:00
Daeho Jeong
a442c576f6
fstab: disable auto compression for apk,apex and so am: c10d805383
am: db1b0654d9
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18931177
Change-Id: Ia55578464886c75361b4d1fd71d508980b2f1942
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-21 22:08:44 +00:00
Daeho Jeong
eb703a418c
fstab: disable auto compression for apk,apex and so am: c10d805383
am: 489cd831f2
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18931177
Change-Id: If01b764df27952b109b44f85c7eb43e5d1e527ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-21 22:08:43 +00:00
Daeho Jeong
489cd831f2
fstab: disable auto compression for apk,apex and so am: c10d805383
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18931177
Change-Id: I084fa4ff294891ab5802e5d52389f95d4638ed37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-21 21:43:07 +00:00
Daeho Jeong
db1b0654d9
fstab: disable auto compression for apk,apex and so am: c10d805383
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18931177
Change-Id: Ie7a1335fdb9946af573039030aabf13ec0001af8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-21 21:41:30 +00:00
Daeho Jeong
c10d805383
fstab: disable auto compression for apk,apex and so
...
Bug: 235480291
Test: check mount option
Signed-off-by: Daeho Jeong <daehojeong@google.com>
Change-Id: I3765847b9c2074e1501646675fed7109a7a73230
2022-06-21 21:14:26 +00:00
Darren Hsu
12f3f942b8
powerstats: set AoC clock for timestamp calculations am: 7dfafc70a0
am: e2fd9e040f
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18965112
Change-Id: I5f58f09c8958e53464d67a660e1ebd26f1492deb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-21 04:26:59 +00:00
Darren Hsu
1ab531d5eb
powerstats: set AoC clock for timestamp calculations am: 7dfafc70a0
am: f2ab4a72d9
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18965112
Change-Id: If50d83b0a421321380a345d48356521d55a93ae2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-21 04:26:44 +00:00
Darren Hsu
e2fd9e040f
powerstats: set AoC clock for timestamp calculations am: 7dfafc70a0
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18965112
Change-Id: I6c3fd2ed069f002dbc6a691d917b1ad2965c5e02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-21 04:00:12 +00:00
Darren Hsu
f2ab4a72d9
powerstats: set AoC clock for timestamp calculations am: 7dfafc70a0
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18965112
Change-Id: I2d7c438ad849efa18dcbf22cd6468fd9243b9e68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-21 04:00:12 +00:00
Xin Li
5405ed6d90
[automerger skipped] Merge SQ3A.220605.009 am: de7209e8a0
am: 231755345a
-s ours am: 9757323e46
-s ours am: 89042ede18
-s ours
...
am skip reason: Merged-In I6ebabb9d53028a05950d7d00c34ffdf33fb8ff2f with SHA-1 346895302a
is already in history
Original change: https://android-review.googlesource.com/c/device/google/gs101/+/2130132
Change-Id: I9fe467b02b61f39830b50c81c745990e7d51cd25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-20 20:59:25 +00:00
Xin Li
89042ede18
[automerger skipped] Merge SQ3A.220605.009 am: de7209e8a0
am: 231755345a
-s ours am: 9757323e46
-s ours
...
am skip reason: Merged-In I6ebabb9d53028a05950d7d00c34ffdf33fb8ff2f with SHA-1 346895302a
is already in history
Original change: https://android-review.googlesource.com/c/device/google/gs101/+/2130132
Change-Id: I659c70dd6310e5133178c35a34f5929093e44acb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-20 15:03:13 +00:00
Xin Li
9757323e46
[automerger skipped] Merge SQ3A.220605.009 am: de7209e8a0
am: 231755345a
-s ours
...
am skip reason: Merged-In I6ebabb9d53028a05950d7d00c34ffdf33fb8ff2f with SHA-1 346895302a
is already in history
Original change: https://android-review.googlesource.com/c/device/google/gs101/+/2130132
Change-Id: I3b5daeefe14722a3b8f9eaba18fd17d0e45b7e21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-20 14:36:30 +00:00
Xin Li
231755345a
Merge SQ3A.220605.009 am: de7209e8a0
...
Original change: https://android-review.googlesource.com/c/device/google/gs101/+/2130132
Change-Id: I5a6344108b6f407aa85eee434472a5e403baab7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-20 14:09:47 +00:00
David Chao
1af01d23c2
gs101: move charger thermalHAL setup into common code am: 88fb3bfe07
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18910875
Change-Id: Ifbb21b248de103997a10c3a2d134354fcf86202f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-20 07:43:10 +00:00
Pierre-Clément Tosi
4c7eb154a8
Revert^2 "gs101: Add pvmfw to AB_OTA_PARTITIONS" am: d5ce52e137
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18577605
Change-Id: If3deb09e014a5de4b2f9c54a43e5f0d3f1e1d2b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-20 07:43:00 +00:00
David Chao
88fb3bfe07
gs101: move charger thermalHAL setup into common code
...
To aligned with P22 to move charger thermalHAL setup into common code
Bug: 200615564
Test: build pass and boot to home
Change-Id: Idfe47fe64e4c158f27cd587ca8d768e13292c361
2022-06-20 07:10:50 +00:00
Xin Li
bad8faec6e
[automerger skipped] Merge Android 12 QPR 3 am: b03bfa6ccf
-s ours am: b6ef0dc62f
-s ours am: d9fce352ad
-s ours am: e492836007
-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: Ie00170424f5fa7754ab35d46afdcb3b47889fdd1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-17 20:52:43 +00:00
Xin Li
e492836007
[automerger skipped] Merge Android 12 QPR 3 am: b03bfa6ccf
-s ours am: b6ef0dc62f
-s ours am: d9fce352ad
-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: Id6208d594032f809f943fdc3d4cc0f97eb90e31b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-17 19:56:25 +00:00
Darren Hsu
7dfafc70a0
powerstats: set AoC clock for timestamp calculations
...
Bug: 233923713
Test: dumpsys android.hardware.power.stats.IPowerStats/default
Change-Id: I40c155c78331255ec5a7d9300798cec0a3d219f5
Merged-In: I40c155c78331255ec5a7d9300798cec0a3d219f5
Signed-off-by: Darren Hsu <darrenhsu@google.com>
2022-06-17 12:49:04 +00:00
Pierre-Clément Tosi
d5ce52e137
Revert^2 "gs101: Add pvmfw to AB_OTA_PARTITIONS"
...
Now that the necessary SELinux policies are in (ag/16507235), we should
be able to re-apply this change without breaking OTA updates
(b/211070100).
This reverts commit efd5649bb8
.
Bug: 210833963
Test: local OTA update (see bug)
Change-Id: I0fd5f840159e4163adde753f6d339546067b8cf6
(cherry picked from commit e635619443
)
2022-06-17 08:24:06 +00:00
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
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