Commit graph

5514 commits

Author SHA1 Message Date
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
1d4d5d12b8 Merge "uwb: update calibration path for GS101 am: bfd1212cf9 am: 7ce62ae61f" into tm-qpr-dev-plus-aosp am: db6fc7d22d
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/19008851

Change-Id: Ia45dd142bb6062d1788071bab33282854cf5aeb4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-23 19:41:29 +00:00
Rex Lin
dac924fa3d uwb: update calibration path for GS101 am: bfd1212cf9 am: fb38288849 am: 8767cd77fe
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/19008851

Change-Id: I6bcad27157aa43655cfe25865a677bc0fe8c6022
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-23 19:40:29 +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
Android Build Coastguard Worker
6f48f14475 Snap for 8756258 from c10d805383 to tm-release
Change-Id: I3bad353696e04d119259e09f770487b1543ec022
2022-06-22 23:02:11 +00:00
Daeho Jeong
b55e6d03f8 fstab: disable auto compression for apk,apex and so am: c10d805383 am: 489cd831f2 am: 45a2cdc56b am: 335e551c91
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18931177

Change-Id: Ief3ca183a8b600fd25476f63430d713e43be3d32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-21 23:02:48 +00:00
Daeho Jeong
b50aa11109 fstab: disable auto compression for apk,apex and so am: c10d805383 am: db1b0654d9 am: a442c576f6 am: 55b65f1495
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18931177

Change-Id: I140d618fe1bcefa7a6c2a356611f0b075744b5af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-21 23:02:01 +00:00
Daeho Jeong
9a5e89fefe fstab: disable auto compression for apk,apex and so am: c10d805383 am: 489cd831f2 am: eb703a418c am: ee5cffc734
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18931177

Change-Id: I35f2dff4b08e17011b0656588631c99b7c19e27f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-21 23:01:04 +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
1ec55cd83d fstab: disable auto compression for apk,apex and so am: c10d805383 am: 7c4f2ae2ff
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18931177

Change-Id: I2a3813a275f0ce30640f37a676177e1c86a1d093
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-21 22:08:03 +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
7c4f2ae2ff 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: I500101fd6d1243c5be89778ecf923704276a997b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-21 21:41:57 +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
4bb5e19ad9 [automerger skipped] powerstats: set AoC clock for timestamp calculations am: 7dfafc70a0 am: e2fd9e040f am: 12f3f942b8 -s ours
am skip reason: Merged-In I40c155c78331255ec5a7d9300798cec0a3d219f5 with SHA-1 7dfafc70a0 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18965112

Change-Id: I06c553877d8acb24dceaf1ddc08f17c50f6f6e84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-21 04:44:55 +00:00
Darren Hsu
a285feb5c9 [automerger skipped] powerstats: set AoC clock for timestamp calculations am: 7dfafc70a0 am: f2ab4a72d9 am: 1ab531d5eb -s ours
am skip reason: Merged-In I40c155c78331255ec5a7d9300798cec0a3d219f5 with SHA-1 3698b06acc is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18965112

Change-Id: I1c4dd85e4057106e493824a9646ac165e3bc27d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-21 04:44:36 +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
78dba379b6 [automerger skipped] Merge SQ3A.220605.009 am: de7209e8a0 am: 231755345a -s ours am: 9757323e46 -s ours am: 89042ede18 -s ours am: 5405ed6d90 -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: Ie64eb0347f01c8aae304ba0d1332999cb5b7e046
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-20 21:18:58 +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
f66bf2fe25 gs101: move charger thermalHAL setup into common code am: 88fb3bfe07 am: 1af01d23c2
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18910875

Change-Id: I1eabfde0a5aa734f0bbeb5205f230e2c98e014c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-20 08:15:41 +00:00
Pierre-Clément Tosi
615d9fccca Revert^2 "gs101: Add pvmfw to AB_OTA_PARTITIONS" am: d5ce52e137 am: 4c7eb154a8
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18577605

Change-Id: Icdb4641906e3e8f99c25733fb4de730727d3cdaa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-20 08:15:06 +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
Darren Hsu
3698b06acc powerstats: set AoC clock for timestamp calculations
Bug: 233923713
Test: dumpsys android.hardware.power.stats.IPowerStats/default
Change-Id: I40c155c78331255ec5a7d9300798cec0a3d219f5
Signed-off-by: Darren Hsu <darrenhsu@google.com>
2022-06-20 04:57:53 +00:00
Xin Li
f968a86de7 [automerger skipped] Merge Android 12 QPR 3 am: b03bfa6ccf -s ours am: b6ef0dc62f -s ours am: d9fce352ad -s ours am: e492836007 -s ours am: bad8faec6e -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: I777ed35cb296de9e4c921d00b444dc594d861745
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-17 21:33:36 +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
Lingfeng Yang
cb4dbe6454 Revert "Switch gs101's GLES system driver to ANGLE"
This reverts commit fdcd0ecb95.

Reason for revert: Bug: 235862124

Change-Id: I779da4bfce22d2f80f70dda4807e6296a04ca5d4
2022-06-17 18:57:18 +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
Android Build Coastguard Worker
1e1492e397 Snap for 8735997 from 079810e65b to tm-release
Change-Id: Ia615c20d61d281b3586a1b7b340600fee8a22a24
2022-06-16 23:11:15 +00:00