Commit graph

5656 commits

Author SHA1 Message Date
Armelle Laine
c2673d8002 Merge "Enable Trusty persist storage (TDP) on block-device" into udc-dev am: ef7ce3877c
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/21616887

Change-Id: Idd7b00efa5bf688d373fbcb46700a676ee7615d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01 04:40:29 +00:00
Armelle Laine
39a9021703 Merge "Define selinux properties for /dev/block/by-name/trusty_persist" into udc-dev am: d38c507ef6
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma-sepolicy/+/21617065

Change-Id: I7774f4fba285cd3a8b65c9c78245da5ee39d9c61
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01 04:40:29 +00:00
Armelle Laine
abe08372ea Merge "Enable Trusty persist storage (TDP) on block-device" into udc-dev am: ef7ce3877c
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/21616887

Change-Id: I10f00b4e70a54b76de5eef8a2b5e78fc9d54e561
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01 04:39:45 +00:00
Armelle Laine
0da9e2ff96 Merge "Define selinux properties for /dev/block/by-name/trusty_persist" into udc-dev am: d38c507ef6
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma-sepolicy/+/21617065

Change-Id: I66c16c9377b4af6c924adfee4b983acff7993e0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01 04:39:44 +00:00
Richard Chang
3c52a9ab3b Merge "sepolicy: update init.te for zram device" into udc-dev 2023-03-01 04:28:58 +00:00
Armelle Laine
ef7ce3877c Merge "Enable Trusty persist storage (TDP) on block-device" into udc-dev 2023-03-01 03:41:09 +00:00
Armelle Laine
d38c507ef6 Merge "Define selinux properties for /dev/block/by-name/trusty_persist" into udc-dev 2023-03-01 03:41:09 +00:00
Kenny Root
076591d107 Add GSA logs policy
This adds a label to the sysfs files for GSA logs to allow dumpstate to
read them during a bugreport.

Bug: 271125313
Test: adb shell dumpstate
Change-Id: I8842c0bec972c4cfad15ca689f8e4ae7fa99e179
2023-02-28 18:33:23 -08:00
Shams Pirani
bf70784db1 zuma: Trigger ACPM PI table update on boot
Bug: 265042173
Test: Boot device and read PI table from ACPM

Change-Id: I0f6a6148254761323ca68717331d6a7b826f7f2f
Signed-off-by: Shams Pirani <spirani@google.com>
2023-03-01 02:30:43 +00:00
Kenny Root
09cb4227bb dumpstate: add GSA logs to bugreport
Add support for reading the GSA logs sysfs file to see the GSA logs in
the bugreports we get from dogfooders.

Bug: 271125313
Test: adb shell dumpstate
Change-Id: I09a2e039451b5eb8b7fa360ba03486bd871fb970
2023-02-28 18:30:42 -08:00
Richard Chang
ee8c7c2df2 sepolicy: update init.te for zram device
Bug: 269221861
Bug: 270633329
Test: Boot
Change-Id: I050e9a72006dcd0b71ba1232e38e5f96bce4c967
2023-03-01 02:04:24 +00:00
TreeHugger Robot
63f78e7b2e Merge "Update bug_map" into udc-dev am: 627e6c1648 am: 312d50fd92
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma-sepolicy/+/21649588

Change-Id: I1ea8df25e7cdd1a0e9283b01c51693caefb82893
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01 01:54:20 +00:00
TreeHugger Robot
9986e1ef13 Merge "Update bug_map" into udc-dev am: 627e6c1648 am: 81390587ae
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma-sepolicy/+/21649588

Change-Id: Iafb1c4276f8d1aa8a9e01090b44f76de8aade0db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01 01:50:18 +00:00
TreeHugger Robot
81390587ae Merge "Update bug_map" into udc-dev am: 627e6c1648
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma-sepolicy/+/21649588

Change-Id: I6c9b8ad61f3ebc5cfab067016b0029b111bc4625
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01 00:54:48 +00:00
TreeHugger Robot
312d50fd92 Merge "Update bug_map" into udc-dev am: 627e6c1648
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma-sepolicy/+/21649588

Change-Id: Ie65327b364ad73df29b337d2de4ad8df51fbfb08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01 00:54:30 +00:00
TreeHugger Robot
627e6c1648 Merge "Update bug_map" into udc-dev 2023-02-28 23:56:31 +00:00
Andrew Chant
a66fece15b Merge "Revert "Zuma: Hold wakelock on boot"" into udc-d1-dev am: fe8380c456
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/21611255

Change-Id: I6e9355b7e17a5b28e7f48877eaa8a4be7460e545
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28 21:47:09 +00:00
Jonglin Lee
3c0dd54d80 Add perfmon policies am: 167eba3ad9
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma-sepolicy/+/21649593

Change-Id: Ibb15e72ed9d9bd5abbf5659bc3b7e925ec88d029
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28 21:47:09 +00:00
Sayanna Chandula
9c174f4fec Merge "thermal: set dfs clock divider to 8" into udc-dev am: 359287372a am: 2c76893efc
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/21551760

Change-Id: I1b60189e18dec19ecab10a7ea477aaa79d3a184e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28 21:41:48 +00:00
Sayanna Chandula
73a2666347 Merge "thermal: set dfs clock divider to 8" into udc-dev am: 359287372a am: 254daa1333
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/21551760

Change-Id: I5183f55df6dfb04e24462143c691773588be2caf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28 21:21:07 +00:00
Kenny Root
0739561de4 Merge "zuma: conf: set gsa log group to system" 2023-02-28 21:16:38 +00:00
Andrew Chant
fe8380c456 Merge "Revert "Zuma: Hold wakelock on boot"" into udc-d1-dev 2023-02-28 21:10:32 +00:00
Sayanna Chandula
2c76893efc Merge "thermal: set dfs clock divider to 8" into udc-dev am: 359287372a
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/21551760

Change-Id: Ib4075d60ca4a6c185116c7ce7f0ea53a2c8360eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28 20:56:56 +00:00
Sayanna Chandula
254daa1333 Merge "thermal: set dfs clock divider to 8" into udc-dev am: 359287372a
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/21551760

Change-Id: I6b097b36fbc8f43130b3b97f18130a3624ebae29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28 20:41:23 +00:00
Ryan Chu
f1facb2a22 Zuma: Hold wakelock on boot am: 98f3b8a913
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/21648350

Change-Id: I033f5ce4c68a87dd79663977c0f2380a6cf29bc7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28 19:11:41 +00:00
Hasini Gunasinghe
29fb44d0df Merge "Set the environment variable to switch the Keymint HAL service to Rust" into udc-d1-dev am: 7f51fa5a41
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/21612416

Change-Id: I900d86d799bc5cadc85c7cb1f7e22402c5823cf1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28 19:08:31 +00:00
Andrew Chant
cad4f138ca Revert "Zuma: Hold wakelock on boot"
This reverts commit 98f3b8a913.

Reason for revert: Fix in ag/21649593
Bug: 247032124

Change-Id: Ib7d127d835dde8c1ab9e9e66ce4fa78837947c49
2023-02-28 18:32:57 +00:00
Jonglin Lee
167eba3ad9 Add perfmon policies
Add perfmon policies to fix hotplug issues.

Bug: 271024526
Bug: 271007431
Change-Id: I974bd99224b983454c6af47f4a08a4fe20699834
Signed-off-by: Jonglin Lee <jonglin@google.com>
2023-02-28 10:19:26 -08:00
Sayanna Chandula
359287372a Merge "thermal: set dfs clock divider to 8" into udc-dev 2023-02-28 18:12:21 +00:00
Kenny Root
286ebed626 zuma: conf: set gsa log group to system
dumpstate runs as system group, so in order to prepare for it to be
readable by dumpstate, we need to change the group to system.

Bug: 271125313
Test: ls -l /sys/devices/platform/16490000.gsa-ns/
Change-Id: Ib8f299e99add9cc2f03887cda78f576924c522cd
2023-02-28 10:01:00 -08:00
Ryan Chu
98f3b8a913 Zuma: Hold wakelock on boot
Hold wakelock on boot to mitigate suspend/resume

Bug: 247032124
Change-Id: I113862adbce70604cf184b5b1bb62fde8ab264d5
(cherry picked from commit 99e7d26840)
2023-02-28 17:46:12 +00:00
Xu Han
fe5bb58212 Update bug_map
Bug: 264483024
Test: Build.
Change-Id: I9a1574b5997d9ac5d26100254c7e20b81930df50
2023-02-28 09:34:58 -08:00
Armelle Laine
473839b618 trusty: Add trusty_stats_test
Test: /data/nativetest64/vendor/trusty_stats_test/trusty_stats_test
Bug: 259517277
Change-Id: I40eba69428df1b577456ab6a79f5ffc634fec9ac
2023-02-28 06:49:59 +00:00
Armelle Laine
43f7439f43 Add metrics to the zuma makefile
Bug: 259517277
Test: TBD
Change-Id: I4423c4df03a34d68dcec81a1ffc1f00e28fb685b
2023-02-28 06:49:59 +00:00
Hasini Gunasinghe
7f51fa5a41 Merge "Set the environment variable to switch the Keymint HAL service to Rust" into udc-d1-dev 2023-02-28 02:22:53 +00:00
Binhao Lin
3e4f946de7 Merge "Enable new multicam framework for P23" into udc-dev am: 2fd4b02088 am: 7e0b8725de
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/21560136

Change-Id: I59c4c0a0be09e3565f5c7feb5897abdb48928c6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28 00:51:43 +00:00
Binhao Lin
85ae15098c Merge "Enable new multicam framework for P23" into udc-dev am: 2fd4b02088 am: 83cf53c41f
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/21560136

Change-Id: I4dd2263fc276e1d08a211cb27ec5e9d3f71b76e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28 00:50:23 +00:00
Binhao Lin
7e0b8725de Merge "Enable new multicam framework for P23" into udc-dev am: 2fd4b02088
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/21560136

Change-Id: I47707ef8e82bc6d0b12adf498a3d567cbacfe0ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-27 23:58:18 +00:00
Binhao Lin
83cf53c41f Merge "Enable new multicam framework for P23" into udc-dev am: 2fd4b02088
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/21560136

Change-Id: I16312572bc8128fa71f2fdfac0a6eeee7e840c17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-27 23:58:11 +00:00
Binhao Lin
2fd4b02088 Merge "Enable new multicam framework for P23" into udc-dev 2023-02-27 23:31:14 +00:00
Cody Heiner
46a2c2df5e Allow twoshay → systemui_app binder call for zuma devices (2) am: dc0b4fc9e9 am: 2d46df5e9a
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma-sepolicy/+/21591811

Change-Id: Iad3100b2d8e84db8e3a42db04205cc0cc7dd9fc4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-27 23:21:23 +00:00
Cody Heiner
09693b450a Allow twoshay → systemui_app binder call for zuma devices (2) am: dc0b4fc9e9 am: 609c49485d
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma-sepolicy/+/21591811

Change-Id: Ice0eb43e04ded0cf95309f5a9e4353413cbbdbb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-27 23:21:06 +00:00
Cody Heiner
2d46df5e9a Allow twoshay → systemui_app binder call for zuma devices (2) am: dc0b4fc9e9
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma-sepolicy/+/21591811

Change-Id: I520655872e8d74b3cadc9f89f795173f5d3874e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-27 22:49:53 +00:00
Cody Heiner
609c49485d Allow twoshay → systemui_app binder call for zuma devices (2) am: dc0b4fc9e9
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma-sepolicy/+/21591811

Change-Id: I04b8ce8cb19be7c8634c78fb7e73e308eba9081d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-27 22:46:45 +00:00
Armelle Laine
35a81f6207 Enable Trusty persist storage (TDP) on block-device
- Define selinux property for /dev/block/by-name/trusty_persist
- Add symlink into init.zuma.rc

Bug: 247013568
Test: - Verify that this change is a NOP for devices with TDP already
        created on top of the legacy f2f2 partition /mnt/vendor/persist/ss
      - Verify that this change creates a valid symlink on a manually
        migrated block device
Change-Id: I231938e708e5a5d6d64818e184a92acdc0ba37de
2023-02-27 22:42:08 +00:00
Armelle Laine
d27961dc1b Define selinux properties for /dev/block/by-name/trusty_persist
Bug: 247013568
Test: - Verify that this change is a NOP for devices with TDP already
        created on top of the legacy f2fs partition /mnt/vendor/persist/ss
      - Verify that this change creates a valid symlink on a manually
        migrated block device
Change-Id: I226f365c6afbb5fa91ec1c9c1943f8dddac8183a
2023-02-27 22:42:08 +00:00
Sayanna Chandula
fadc2aeb42 thermal: set dfs clock divider to 8
Increase the DFS clock divider to avoid thermal reset.
Disable CPU cluster power down during clock settings.

Bug: 268768104
Test: Build and boot on device. Check with geek bench test

Change-Id: Ic4b959a7db0c5e903d617531d449b08cc5c81d0a
Signed-off-by: Sayanna Chandula <sayanna@google.com>
2023-02-27 22:33:33 +00:00
Armelle Laine
1731179cf1 Merge "Define selinux properties for /dev/block/by-name/trusty_persist" 2023-02-27 20:07:35 +00:00
Armelle Laine
e4e70f66b1 Merge "Enable Trusty persist storage (TDP) on block-device" 2023-02-27 20:07:35 +00:00
Hasini Gunasinghe
9c6d86ddaa Set the environment variable to switch the Keymint HAL service to Rust
Ref: aosp/2328294

Note:
This CL switches the Keymint HAL to the Rust implementation which can
only communicate with a Keymint TA implemented in Rust in Trusty.
go/gpar/489149 switches the Keymint TA to the Rust implementation.

Therefore, this CL is one of two CLs that needs to be synced in order
for the zuma devices to be able to boot with
Keymint Rust implementation.

Bug: 197891150
Bug: 225036046
Test: VtsAidlKeyMintTargetTest
Change-Id: I53307b3911a478d941fc2d6cc39f3d410ad050e0
2023-02-27 18:14:52 +00:00