Commit graph

925 commits

Author SHA1 Message Date
Zheng Pan
b481660643 Install insmod config file to vendor_dlkm/etc
Insmod configs are moved from HLOS to kernel repo and need to
build in vendor_dlkm.img

Bug: 270603150
Test: Build image and flash. Make sure modules are loaded and
      configs exist under /vendor_dlkm/etc
Change-Id: I46cb20dddab8633725445b546cb2cd0a4a68bd6a
2023-03-07 19:07:28 +00:00
Adam Shih
bdb4b8f669 remove dump text section
Bug: 269212897
Test: adb bugreport
Change-Id: I73d005268bd3964477a8af776362ec57f969cc0d
2023-03-07 10:54:07 +08:00
Adam Shih
dfbc066486 Merge "move camera dump to gs-common" into udc-dev am: 608ff36086
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/21692922

Change-Id: I70bc6152428a9b054be3ef858f6479b5c0fd7413
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 00:04:42 +00:00
Adam Shih
608ff36086 Merge "move camera dump to gs-common" into udc-dev 2023-03-06 23:29:45 +00:00
Adam Shih
59e7623ba5 Merge "Move common display dump to gs-common" into udc-dev am: f122db3f24
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/21644567

Change-Id: I789c9c5554c40c038d75261584b6ffed146e13c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-06 23:11:09 +00:00
Adam Shih
f122db3f24 Merge "Move common display dump to gs-common" into udc-dev 2023-03-06 22:27:50 +00:00
Chris Paulo
ccefd63fa7 BoardConfig: Add haptics actuator model config and adaptive haptics
config

Add soong config definition for haptics actuator model to support pwle
characterization, and support adaptive haptics compilation

Bug: 264682582
Bug: 198239103
Test: Manual test to confirm proper characterization
Change-Id: I2c792ee5c6acd4ef102a81c4e524c6739ddb05e5
Signed-off-by: Chris Paulo <chrispaulo@google.com>
2023-03-06 20:58:15 +00:00
Sayanna Chandula
7726f58fee Merge "thermal: enable warm_reset on thermal shutdown" into udc-dev am: 00064c8005
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/21757783

Change-Id: I59f71b469571fbbafcf73358631789e7a81cec82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-06 20:45:23 +00:00
Sayanna Chandula
00064c8005 Merge "thermal: enable warm_reset on thermal shutdown" into udc-dev 2023-03-06 19:52:01 +00:00
Adam Shih
94963243c4 Merge "Move modem dump log to gs-common" into udc-dev am: 5c2d07e775
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/21692921

Change-Id: Ic5d577d1012491fe74a885ba6f63f75290c8bc1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-06 08:03:40 +00:00
Adam Shih
5c2d07e775 Merge "Move modem dump log to gs-common" into udc-dev 2023-03-06 07:33:19 +00:00
Adam Shih
881ed63c9e Move common display dump to gs-common
Bug: 269212897
Test: adb bugreport
Change-Id: Ib42ea1125b58b8a41da64b047238312b5f13bfbb
2023-03-06 06:33:30 +00:00
Jack Wu
11f215f2f8 Revert "Revert "zuma: update AIDL IGoogleBattery manifest version to 2"" am: 5d02637b59
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/21781456

Change-Id: I57dd2f6dede15df90f9c1689bcae2bdefa1dbb17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-06 02:50:47 +00:00
Jack Wu
5d02637b59 Revert "Revert "zuma: update AIDL IGoogleBattery manifest version to 2""
Bug: 271224032
Test: TH
This reverts commit 6cd2eb1735.

Change-Id: If33832486305b5e7df8ae96f2888dfd3b5f4ef97
2023-03-04 13:10:36 +08:00
Peter Collingbourne
31281f7f3c Revert "Temporarily disable KASAN until bugfix is merged into [redacted] kernel."
This reverts commit 3174340456.

Reason for revert: Kernel prebuilt with bugfix has landed: ag/21613833

Bug: 265863271
Change-Id: I7c688065783303ca0666f38058fbf853be51e199
Merged-in: I7c688065783303ca0666f38058fbf853be51e199
(cherry picked from commit 82efb36664)
2023-03-04 01:28:11 +00:00
Sayanna Chandula
1f57994db5 thermal: enable warm_reset on thermal shutdown
Bug: 269552599
Test: Build and boot on device. Check lastlogcat on thermal shutdown

Change-Id: I39e84d7beeb19fe604b4accfcef9d9ed2240329a
Signed-off-by: Sayanna Chandula <sayanna@google.com>
2023-03-03 11:57:26 -08:00
Sayanna Chandula
b12a3f33b6 Merge "thermal: allow disp_therm trip point change by system" into udc-dev am: cba4a82603
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/21733880

Change-Id: I1fe1195bf3ac3d6b89eff8eee2b0743af2e92693
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-03 18:17:33 +00:00
Sayanna Chandula
cba4a82603 Merge "thermal: allow disp_therm trip point change by system" into udc-dev 2023-03-03 18:02:25 +00:00
Sayanna Chandula
5bfd0dfe4b thermal: allow disp_therm trip point change by system
Bug: 268735739
Test: Build and boot on device

Change-Id: I255c97f6155cdbad79209f96d7a16c5580635ead
Signed-off-by: Sayanna Chandula <sayanna@google.com>
2023-03-03 18:00:32 +00:00
Jack Wu
e8a63fcc0c Revert "zuma: update AIDL IGoogleBattery manifest version to 2" am: 6cd2eb1735
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/21737896

Change-Id: I83f95366ce0011b1299b2dc21d95e641d5ae9656
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-03 17:44:01 +00:00
Midas Chien
1e740b0899 Merge "BoardConfig: support SKIP_VALIDATE by default" into udc-dev am: 7b4da9ab73
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/21612082

Change-Id: If45dead4d6968a8a9fcafdacce071785ecc1b82b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-03 17:28:50 +00:00
Jack Wu
6cd2eb1735 Revert "zuma: update AIDL IGoogleBattery manifest version to 2"
Bug: 271224032
Test: TH
Reason for revert: Build Breakage on redfin

This reverts commit 172a3c5167.

Change-Id: Ibe1eedbe5ebc604f6f022716b9f34059adb85186
2023-03-03 19:17:47 +08:00
Midas Chien
7b4da9ab73 Merge "BoardConfig: support SKIP_VALIDATE by default" into udc-dev 2023-03-03 03:48:40 +00:00
Jack Wu
bd964b6726 zuma: update AIDL IGoogleBattery manifest version to 2 am: 172a3c5167
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/21698704

Change-Id: I4e2d492f58580f1b84680ee572d44372d16b6f3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-03 01:20:19 +00:00
Jack Wu
172a3c5167 zuma: update AIDL IGoogleBattery manifest version to 2
Bug: 271224032
Test: TH
Change-Id: I5db4e189fc537c15b9cbb7afb3b30874823309d2
Signed-off-by: Jack Wu <wjack@google.com>
2023-03-02 11:44:03 +00:00
Ernie Hsu
19278e28b5 Merge "Include mediacodec_samsung setting from gs-common" into udc-dev am: fe78132e16
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/21546839

Change-Id: Ia92cd28c5b0380f9d4ac6d7cbf6a7cdde43d7b3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-02 09:19:35 +00:00
Ernie Hsu
fe78132e16 Merge "Include mediacodec_samsung setting from gs-common" into udc-dev 2023-03-02 08:38:54 +00:00
Chien Kun Niu
b907e534f1 Merge changes If0925a61,I9d6624cb,I7cc7070d,I2c1091aa into udc-dev am: 7946bd55e7
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/21506632

Change-Id: I70e275b23bd7e321ea58e335793eb2856783c083
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-02 07:33:10 +00:00
Adam Shih
5ed79e55dc move camera dump to gs-common
Bug: 240530709
Test: adb bugreport
Change-Id: I9ffb7f1fd93462237e4610592d0589cedbc3d1ab
2023-03-02 15:09:16 +08:00
Chien Kun Niu
7946bd55e7 Merge changes If0925a61,I9d6624cb,I7cc7070d,I2c1091aa into udc-dev
* changes:
  Fix up open bugs from gs201 AIDL migration
  Add resetCb
  Migrate IUsbGadget implementation to AIDL
  usb: limit the current to 1.3A when connect to accessory
2023-03-02 06:59:25 +00:00
Adam Shih
e305d69c78 Move modem dump log to gs-common
Bug: 240530709
Test: adb bugreport
and the following file got to dumpstate_board.bin:
extended_log_uim.txt
extended_log_os.txt
nv_normal.bin
nv_protected.bin

Change-Id: I4994cdef97805aa54dbf54b218beea796a6b7969
2023-03-02 14:10:49 +08:00
Hiroshi Akiyama
589b17f683 Add logging for BCL IRQ durations to dumpstate
Bug: 269752322
Test: adb bugreport
Signed-off-by: Hiroshi Akiyama <hiroshiakiyama@google.com>
Change-Id: I5a771ddf3f5da5b5c285a1e3217f6b3a62b8a0ff
Merged-In: Icd524bd32ed41c3de72f0e1b13428d76e871d203
2023-03-02 06:02:52 +00:00
Adam Shih
cfd9b05e30 Merge "move gxp dump to gs-common" into udc-dev am: a759a55943
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/21647082

Change-Id: Ie32b6da066d0c3221a5743055f244687ff6cbf6e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-02 03:34:33 +00:00
Adam Shih
a759a55943 Merge "move gxp dump to gs-common" into udc-dev 2023-03-02 02:45:46 +00:00
Adam Shih
cb302d9794 move gxp dump to gs-common
ag/21644929 is where the operation lives in the future.
Bug: 240530709
Test: adb bugreport
Change-Id: I6e621228a1964ec0b83afe02cd0059c7ee361b20
2023-03-01 21:58:41 +00:00
Ernie Hsu
6fb95110c4 Include mediacodec_samsung setting from gs-common
Bug: 263444717
Test: build pass, camera record, youtube
Change-Id: If553375d51d038627ed8d5fb0900e9e676f6015f
2023-03-01 11:41:46 +00:00
Midas Chien
a9fb23b80d BoardConfig: support SKIP_VALIDATE by default
Bug: 270479799
Test: VtsHalGraphicsComposer3_TargetTest
Change-Id: I7fbcdbaa793389b2fc70010e3ae69d018d74f12f
2023-03-01 15:56:09 +08:00
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
ef7ce3877c Merge "Enable Trusty persist storage (TDP) on block-device" into udc-dev 2023-03-01 03:41:09 +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
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
Sayanna Chandula
359287372a Merge "thermal: set dfs clock divider to 8" into udc-dev 2023-02-28 18:12:21 +00: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
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
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
2fd4b02088 Merge "Enable new multicam framework for P23" into udc-dev 2023-02-27 23:31:14 +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
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
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