Commit graph

2571 commits

Author SHA1 Message Date
Thurston Dang
db3f33841f Clear secure deletion keys upon factory reset am: eeecbaf3cc am: 843e3b2768 am: 6fc663b2e9
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/18808040

Change-Id: I8bb59265d4e92f9eca756bf038a8236a6aafe5dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 17:52:44 +00:00
Thurston Dang
679775c136 Clear secure deletion keys upon factory reset am: eeecbaf3cc am: 227972b2cf am: fdc259ccd2
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/18808040

Change-Id: I7579f99b8578ea78723f0a549a58abdc17a820ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 17:49:55 +00:00
Thurston Dang
b6337263ef Clear secure deletion keys upon factory reset am: eeecbaf3cc am: 227972b2cf
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/18808040

Change-Id: Ia370ac6439dc5cdab93ca06e3ad051493d5ccc69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 17:22:26 +00:00
Thurston Dang
fdc259ccd2 Clear secure deletion keys upon factory reset am: eeecbaf3cc am: 227972b2cf
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/18808040

Change-Id: I90ed858cbed2b2e0491485f894d30d7f678877d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 17:22:21 +00:00
Thurston Dang
6fc663b2e9 Clear secure deletion keys upon factory reset am: eeecbaf3cc am: 843e3b2768
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/18808040

Change-Id: I907bfbc4ac8d5bfea0b63dbb804ef705860a1ad0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 17:16:17 +00:00
Thurston Dang
227972b2cf Clear secure deletion keys upon factory reset am: eeecbaf3cc
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/18808040

Change-Id: Iea12a3756c309b2bc78a585e671f51e636c7a191
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 16:54:31 +00:00
Thurston Dang
ab3bbe3589 Clear secure deletion keys upon factory reset am: eeecbaf3cc
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/18808040

Change-Id: I9d7c73382475aa40e9e8705cd506742b7f9f978f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 16:53:42 +00:00
Thurston Dang
843e3b2768 Clear secure deletion keys upon factory reset am: eeecbaf3cc
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/18808040

Change-Id: I2954bb9305658a76224ced14ce9c444eeace1110
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 16:52:49 +00:00
Jonglin Lee
0a5aef1445 Revert "thermal: enable warm_reset on thermal shutdown" am: 6e9c7db1d2 am: a21c8298c8 am: 5388e87f85
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/18842724

Change-Id: Icddf53539e286c8df205714a9405f74a9880529c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-11 03:59:40 +00:00
Jonglin Lee
dc966ef03d Revert "thermal: enable warm_reset on thermal shutdown" am: 6e9c7db1d2 am: 49b3abc0be am: 511ee7739e
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/18842724

Change-Id: I493b3c25e591e4bfdddbec6f1c0598fa15bbd829
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-11 03:59:24 +00:00
Jonglin Lee
5388e87f85 Revert "thermal: enable warm_reset on thermal shutdown" am: 6e9c7db1d2 am: a21c8298c8
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/18842724

Change-Id: Ie2b6caec4316d092cdd60ece128ff1c1ce0ab04c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-11 03:14:27 +00:00
Jonglin Lee
511ee7739e Revert "thermal: enable warm_reset on thermal shutdown" am: 6e9c7db1d2 am: 49b3abc0be
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/18842724

Change-Id: I4d6b236927987713daedc918cb40f87e4719cce0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-11 03:14:11 +00:00
Jonglin Lee
a21c8298c8 Revert "thermal: enable warm_reset on thermal shutdown" am: 6e9c7db1d2
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/18842724

Change-Id: Iaaac7f4ce21ab0c363f0e0d73d750396c7ca913d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-11 02:49:55 +00:00
Jonglin Lee
49b3abc0be Revert "thermal: enable warm_reset on thermal shutdown" am: 6e9c7db1d2
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/18842724

Change-Id: I4c89af76ebb8bc4c1d4fcc20583d38b8ea8c95f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-11 02:49:44 +00:00
Jonglin Lee
6e9c7db1d2 Revert "thermal: enable warm_reset on thermal shutdown"
This reverts commit 06fea09686.

Reason for revert: abl change to remove 15 second timeout was
reverted, thus need to revert this change to prevent potential
dogfood device damage during thermal warm_reset

Bug: 235641682
Change-Id: Iacd4ef094ba12e326f7660645005e3eab48dcf83
Signed-off-by: Jonglin Lee <jonglin@google.com>
2022-06-11 02:31:01 +00:00
Rick Chen
8208703e7d usf: Include usf_product.mk for USF PDK. am: a84bd15d43 am: b4e680dfe6 am: 42f42783f8
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/18754376

Change-Id: I5ef7cfac8068f4472b37f72937d41e831f36d3bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-10 02:51:16 +00:00
Rick Chen
3824b45b97 usf: Include usf_product.mk for USF PDK. am: a84bd15d43 am: 95579ac45c am: f953d68dc7
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/18754376

Change-Id: If5627a02b7885b781f1bdc2691b575ea90fa1942
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-10 02:50:58 +00:00
Rick Chen
42f42783f8 usf: Include usf_product.mk for USF PDK. am: a84bd15d43 am: b4e680dfe6
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/18754376

Change-Id: I3df27bbcb3ce25b7a446f2fa3b9f1a68fa7407a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-10 02:33:31 +00:00
Rick Chen
f953d68dc7 usf: Include usf_product.mk for USF PDK. am: a84bd15d43 am: 95579ac45c
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/18754376

Change-Id: I0d3d69c4587edfebf96a4ee65ef40c20fc0d3deb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-10 02:33:11 +00:00
Rick Chen
b4e680dfe6 usf: Include usf_product.mk for USF PDK. am: a84bd15d43
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/18754376

Change-Id: I1fd2f904e68a71568f9a8e40d0eb7097cff1a30d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-10 02:17:55 +00:00
Rick Chen
95579ac45c usf: Include usf_product.mk for USF PDK. am: a84bd15d43
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/18754376

Change-Id: I5e748e0595cdff96b9804024a3ea080690289198
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-10 02:17:16 +00:00
Rick Chen
a84bd15d43 usf: Include usf_product.mk for USF PDK.
Bug: 234324473
Test: Compile pass. Verified sensor list & sampling on C10.
      The validation is done both on PDK build and tm-d1-dev build.
Signed-off-by: Rick Chen <rickctchen@google.com>
Change-Id: I371104ceeb39d668dabaf2ba5f705146c60d9bab
2022-06-10 01:46:26 +00:00
Thurston Dang
eeecbaf3cc Clear secure deletion keys upon factory reset
This ports the gs101 configuration - which clears the secure
deletion keys upon factory reset - to (REDACTED DEVICE), as
suggested by David Drysdale in b/223934835#comment53. In the
absence of this change, the key slots may eventually get filled
up (e.g., by failing tests) and never be released.

Bug: 223934835
Test: Check logcat that keys are cleared after factory reset
Change-Id: I56efb76cb6bb0cdfe2eb9b0ac3ca89e49bfc57f0
(cherry picked from commit 4da7fdc1a7)
2022-06-09 05:43:45 +00:00
David Chao
1fce16a469 thermal: allow system to overwrite the skin_therm1's trip point am: 2b483be348 am: 2d3df105b6
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/18753608

Change-Id: I3a9764ee130dddfc12c75ca6a16c557789daaac8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09 04:06:00 +00:00
David Chao
2d3df105b6 thermal: allow system to overwrite the skin_therm1's trip point am: 2b483be348
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/18753608

Change-Id: Id07cd520f5b3754ff15c91c0177709158e84c3e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09 03:43:06 +00:00
David Chao
2b483be348 thermal: allow system to overwrite the skin_therm1's trip point
/dev/thermal/tz-by-name/skin_therm1 # ls -l
total 0
-rw-r--r-- 1 system system 4096 2022-06-06 13:41 trip_point_0_hyst
-rw-r--r-- 1 system system 4096 2022-06-06 13:41 trip_point_0_temp

Bug: 233972622
Test: ls -al /dev/thermal/tz-by-name/skin_therm1/
Change-Id: I347c645c7ce23e6e26ea7ef20db9d6f0a66b6498
2022-06-09 03:17:57 +00:00
Oleg Matcovschi
224ae0bee3 thermal: enable warm_reset on thermal shutdown am: 06fea09686 am: 99f94b8f13 am: cd9c3b42be
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/18634163

Change-Id: I4f469438b21077d2a005dd6e9c59e92e29dd668a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09 00:39:00 +00:00
Oleg Matcovschi
da681ca239 thermal: enable warm_reset on thermal shutdown am: 06fea09686 am: 6799446b7b am: 33d6457227
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/18634163

Change-Id: Ic05fe0a5519deca51a4c4a6ab6a223e5a72641c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09 00:38:23 +00:00
Oleg Matcovschi
cd9c3b42be thermal: enable warm_reset on thermal shutdown am: 06fea09686 am: 99f94b8f13
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/18634163

Change-Id: I8322746c9fb11fda2d59405ae417f308d0cfc73c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09 00:11:50 +00:00
Oleg Matcovschi
33d6457227 thermal: enable warm_reset on thermal shutdown am: 06fea09686 am: 6799446b7b
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/18634163

Change-Id: I7a11791391fbd89f9edd684e4d27fd29af35d195
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09 00:11:27 +00:00
Oleg Matcovschi
6799446b7b thermal: enable warm_reset on thermal shutdown am: 06fea09686
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/18634163

Change-Id: I06f6b958b1b6ed5abd925ee22e4739c53f89b525
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-08 23:22:50 +00:00
Oleg Matcovschi
99f94b8f13 thermal: enable warm_reset on thermal shutdown am: 06fea09686
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/18634163

Change-Id: I2162adfdb15e5b05b342f94c65123c14037bda28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-08 23:22:45 +00:00
Oleg Matcovschi
06fea09686 thermal: enable warm_reset on thermal shutdown
Test: adb shell setprop sys.powerctl shutdown,thermal
Bug: 232092738
Signed-off-by: Oleg Matcovschi <omatcovschi@google.com>
Change-Id: I198b8de7055b8713460340df613d4309df72ec6d
2022-06-08 18:55:02 +00:00
Stephane Lee
35cc68aa22 Add device-specific support for GoogleBattery AIDL V1
Bug: 232461104
Test: Ensure Adaptive Charging/Battery health flags works as expected
Change-Id: I8266f622641ca42672685ce3869f03b433cadbe6
2022-06-08 18:10:40 +00:00
Kean Mariotti
0c2e0a54d1 Revert "init: fix incorrect pca94xx sysfs node path" am: 41329324a4 am: 3905b03c49
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/18796207

Change-Id: I37a62a5ced464d99c8926ddcf8ceceef08429249
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-08 15:49:19 +00:00
Thurston Dang
4da7fdc1a7 Clear secure deletion keys upon factory reset
This ports the gs101 configuration - which clears the secure
deletion keys upon factory reset - to (REDACTED DEVICE), as
suggested by David Drysdale in b/223934835#comment53. In the
absence of this change, the key slots may eventually get filled
up (e.g., by failing tests) and never be released.

Bug: 223934835
Test: Check logcat that keys are cleared after factory reset
Change-Id: I56efb76cb6bb0cdfe2eb9b0ac3ca89e49bfc57f0
2022-06-08 15:35:02 +00:00
Kean Mariotti
3905b03c49 Revert "init: fix incorrect pca94xx sysfs node path" am: 41329324a4
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/18796207

Change-Id: Ie64995226fc351b7baaf81a79ca48a8c633ed2c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-08 15:17:24 +00:00
Kean Mariotti
41329324a4 Revert "init: fix incorrect pca94xx sysfs node path"
This reverts commit 0d15498d3e.

Reason for revert: 235332394

Change-Id: I50e46d66f33b1b29917f6827fc9cb51da9fe293a
2022-06-08 12:51:36 +00:00
Jack Wu
43f80a84b1 init: fix incorrect pca94xx sysfs node path am: 0d15498d3e am: 8b48fa1d7b
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/18773323

Change-Id: I32b99e084e46a4b2d53fd0d26fe4f111b10da91e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-08 10:32:39 +00:00
Jack Wu
8b48fa1d7b init: fix incorrect pca94xx sysfs node path am: 0d15498d3e
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/18773323

Change-Id: I2849497245ca182069061e778fe66b3048bad71b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-08 09:49:19 +00:00
Jack Wu
0d15498d3e init: fix incorrect pca94xx sysfs node path
Bug: 235050913
Test: can parse pca stats in pixelstats-uevent
Signed-off-by: Jack Wu <wjack@google.com>
Change-Id: I4b921102bd46544adfc049816ba31b3188859973
2022-06-08 09:24:39 +00:00
Erik Staats
f117cb7bf1 Add head tracker feature. am: cd51a5d5bf am: f354e504dc am: 4bdaa24fe0
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/18783036

Change-Id: I088214fe3f0f445271e8118e8d182279271f481c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-08 00:21:49 +00:00
Erik Staats
34351aa623 Add head tracker feature. am: cd51a5d5bf am: 894a5ddb92 am: 5da1a96434
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/18783036

Change-Id: I2fb83629b0c5ce147a9961591f6f5136da459e0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-08 00:21:19 +00:00
Erik Staats
4bdaa24fe0 Add head tracker feature. am: cd51a5d5bf am: f354e504dc
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/18783036

Change-Id: I5fb7f19c7c5d5765ba8a3bb493148525407c1107
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 23:51:42 +00:00
Erik Staats
5da1a96434 Add head tracker feature. am: cd51a5d5bf am: 894a5ddb92
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/18783036

Change-Id: Ia76bb5a49b3f17c783dc5b45d9abea309b3685d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 23:51:22 +00:00
Erik Staats
f354e504dc Add head tracker feature. am: cd51a5d5bf
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/18783036

Change-Id: I13d75516a07959a98ee4ce06107db92c3037ed08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 23:26:01 +00:00
Erik Staats
894a5ddb92 Add head tracker feature. am: cd51a5d5bf
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/18783036

Change-Id: I56197043111b5a967ec6033b95f2d7ca4f89cc20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 23:25:54 +00:00
Erik Staats
cd51a5d5bf Add head tracker feature.
Bug: 233082034
Test: Verified that head tracker feature is set and sensor feature CTS
 test passes.
Change-Id: I125284a6264af74d9aebfa8a1cb1e91a8f6a67a1
2022-06-07 23:00:41 +00:00
Jenny Ho
3f0bd74144 dumpstate: dump AACR related data am: 4617cffdd7 am: c25e2e155e am: adae103a56
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/18673509

Change-Id: I7544c2aa33b22cd46a3d7f552aa425294d5ee9d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 14:04:29 +00:00
Jenny Ho
16c33bac06 dumpstate: dump AACR related data am: 4617cffdd7 am: 5dc4ae0a52 am: cc1e0b42cc
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/18673509

Change-Id: I6bb2832582f314be12f8eaaa12799e5051479407
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 14:04:21 +00:00