Commit graph

545 commits

Author SHA1 Message Date
Peter Collingbourne
e1485940e6 [automerger skipped] Revert "Temporarily disable KASAN until bugfix is merged into [redacted] kernel." am: 31281f7f3c -s ours
am skip reason: Merged-In I7c688065783303ca0666f38058fbf853be51e199 with SHA-1 82efb36664 is already in history

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

Change-Id: I117e56d640896e27f58e6982c51c21bfbecff788
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-04 06:44:01 +00:00
Sayanna Chandula
d7c4e71e51 Merge "thermal: allow disp_therm trip point change by system" into udc-dev am: cba4a82603 am: 4b7bee2d74
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/21733880

Change-Id: I896b3f7aa82f1c8bd98870929e6e54ff0ffa446b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-04 06:37:32 +00:00
Ziyi Cui
83cf2a40af Merge "init: add memlat parameter stall_floor" 2023-03-04 04:25:05 +00: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
TreeHugger Robot
bc4945e31f Merge "Revert "Temporarily disable KASAN until bugfix is merged into [redacted] kernel."" 2023-03-04 00:09:46 +00:00
Peter Collingbourne
82efb36664 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

Change-Id: I7c688065783303ca0666f38058fbf853be51e199
2023-03-03 23:01:17 +00:00
Sayanna Chandula
4b7bee2d74 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: I3314f01c6fb6b9d0319650ee8c775f72c84cf516
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-03 19:48:21 +00:00
Sayanna Chandula
8d94f5620f Merge "thermal: allow disp_therm trip point change by system" into udc-dev am: cba4a82603 am: b12a3f33b6
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/21733880

Change-Id: I17b09f58682ab7896c5fe0228bb4b2405f0d0bb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-03 18:44:43 +00:00
Jack Wu
9e59159fa8 Revert "zuma: update AIDL IGoogleBattery manifest version to 2" am: 6cd2eb1735 am: e8a63fcc0c
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/21737896

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

Change-Id: I5e627a9672c9752389860cf984d1c1bef0cea358
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-03 18:18:48 +00: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
51baac6cdc Revert "zuma: update AIDL IGoogleBattery manifest version to 2" am: 6cd2eb1735 am: 06e86342af
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/21737896

Change-Id: Ia56ed6d0647f23bad7cd7d33565a5b51a46fc3cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-03 18:00:03 +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
06e86342af 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: I3d47109fde5ba1273f6d444fc91db103471f713e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-03 17:02:16 +00:00
Midas Chien
d4af5f080a Merge "BoardConfig: support SKIP_VALIDATE by default" into udc-dev am: 7b4da9ab73 am: e5e88f15eb
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/21612082

Change-Id: Ib838220456f7ef0c2876a5b7de5e175bbc513920
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-03 16:58:08 +00:00
Midas Chien
e5e88f15eb 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: Id40cf203e35172c37360e5d8e4bc6a86d0b49f69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-03 16:55:41 +00:00
Jack Wu
45ae4fd44e zuma: update AIDL IGoogleBattery manifest version to 2 am: 172a3c5167 am: bd964b6726
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/21698704

Change-Id: I5daa403ec7564b228d5731c392f69d2bd6be72a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-03 16:51:53 +00:00
Jack Wu
495c6488e0 zuma: update AIDL IGoogleBattery manifest version to 2 am: 172a3c5167 am: 2c5d284bb2
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/21698704

Change-Id: Ib785276188a17a78317d2a14e2ed748eb31f5217
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-03 16:49:42 +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
2c5d284bb2 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: I9cc16c0bf08b104bd1cc75af333df3de9cb5ac9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-03 01:18:46 +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
cbf7ddba2e Merge "Include mediacodec_samsung setting from gs-common" into udc-dev am: fe78132e16 am: 28e4132499
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/21546839

Change-Id: I43ad825308a741ae9f4d106a09a6e7dacdb85fef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-02 10:11:38 +00:00
Ernie Hsu
9674a96a18 Merge "Include mediacodec_samsung setting from gs-common" into udc-dev am: fe78132e16 am: 19278e28b5
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/21546839

Change-Id: If39f1a3eede6e17885bc38cc3fe8d0674f66a5d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-02 10:10:30 +00:00
Ernie Hsu
28e4132499 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: I705e698f0701763c15f00e941e938c5dc82c095c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-02 09:19:42 +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
d3fca0041c Merge changes If0925a61,I9d6624cb,I7cc7070d,I2c1091aa into udc-dev am: 7946bd55e7 am: eb6db6245b
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/21506632

Change-Id: I505eb51b7e7e9d018d3d7656e136a47d31e4f28c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-02 08:05:37 +00:00
Chien Kun Niu
a3700800d1 Merge changes If0925a61,I9d6624cb,I7cc7070d,I2c1091aa into udc-dev am: 7946bd55e7 am: b907e534f1
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/21506632

Change-Id: Icad91b5936c068952f4b988b8fdc1a61e8e1e0b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-02 07:46:58 +00:00
Hiroshi Akiyama
cd4e2ecff2 Add logging for BCL IRQ durations to dumpstate am: 589b17f683
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/21694868

Change-Id: I7f0c4e603a2eda9c8d4b494960f192acf82214a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-02 07:46:43 +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
Chien Kun Niu
eb6db6245b 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: If3a8bb35fc5d7d0333a9d167c65bc5e322f16320
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-02 07:33:05 +00: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
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
Hiroshi Akiyama
97169c20d0 Merge "Add logging for BCL IRQ durations to dumpstate" 2023-03-02 04:21:56 +00:00
Adam Shih
054f0092fc Merge "move gxp dump to gs-common" into udc-dev am: a759a55943 am: cfd9b05e30
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/21647082

Change-Id: I963df6b17f68abccaa7635e90ca18d6edce4e9a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-02 04:11:38 +00:00
Adam Shih
7768e1838a Merge "move gxp dump to gs-common" into udc-dev am: a759a55943 am: 5400666dd3
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/21647082

Change-Id: I084a882a22b8c8dae25b083206047905e8be3239
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-02 04:10:42 +00:00
Adam Shih
5400666dd3 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: I36697ee50395e0110614f81365265a03c34c0541
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-02 03:35:22 +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
Hiroshi Akiyama
7f475a8f49 Add logging for BCL IRQ durations to dumpstate
Bug: 269752322
Test: adb bugreport
Signed-off-by: Hiroshi Akiyama <hiroshiakiyama@google.com>
Change-Id: I5a771ddf3f5da5b5c285a1e3217f6b3a62b8a0ff
2023-03-02 03:03:49 +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
Ziyi Cui
cb40d6cc4a init: add memlat parameter stall_floor
Bug: 232948888
Test: build, flash, gb5 and sjeng test
Change-Id: If6d588752daec14853fdf1e515b88ce22355cc60
Signed-off-by: Ziyi Cui <ziyic@google.com>
2023-03-01 17:52:01 +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
Kenny Root
83af317755 Merge "dumpstate: add GSA logs to bugreport" 2023-03-01 05:51:40 +00:00