Adam Shih
db2f65327e
Merge "remove dump text section" into udc-dev am: b90aaae77b
am: ea136aebf3
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/21806765
Change-Id: I7125361d8bc05ed522453a97906de891777756f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-09 06:00:37 +00:00
Adam Shih
ea136aebf3
Merge "remove dump text section" into udc-dev am: b90aaae77b
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/21806765
Change-Id: I5db57f6557f340e4fd0ae837f8ec267d2af779e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-09 05:29:16 +00:00
Adam Shih
b90aaae77b
Merge "remove dump text section" into udc-dev
2023-03-09 05:09:26 +00:00
KRIS CHEN
045391fafc
Merge "Set permission for dpu hibernation sysfs node" into udc-dev am: 1e84c90b64
am: ac9d4b2b8a
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/21873541
Change-Id: I6df7bb7fcb5238953a2e25cb758b48a39cbdaac2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-09 04:52:36 +00:00
KRIS CHEN
8643a2223e
Merge "Set permission for dpu hibernation sysfs node" into udc-dev am: 1e84c90b64
am: 62b9037e6d
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/21873541
Change-Id: I836a375004d475d769c937619287e2895ddf996d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-09 04:51:37 +00:00
KRIS CHEN
ac9d4b2b8a
Merge "Set permission for dpu hibernation sysfs node" into udc-dev am: 1e84c90b64
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/21873541
Change-Id: Ie605bd4bf5e3fdd7e3f6ed63f48dead555ca6081
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-09 04:21:31 +00:00
KRIS CHEN
62b9037e6d
Merge "Set permission for dpu hibernation sysfs node" into udc-dev am: 1e84c90b64
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/21873541
Change-Id: I9f87eef160f28b6aaa8632f88a6b45db157f797c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-09 04:21:05 +00:00
KRIS CHEN
1e84c90b64
Merge "Set permission for dpu hibernation sysfs node" into udc-dev
2023-03-09 03:53:46 +00:00
Kris Chen
ca44e39b68
Set permission for dpu hibernation sysfs node
...
Bug: 256947811
Bug: 251239489
Bug: 267271482
Test: Perform udfps osc compensation.
Change-Id: I0e9e48387d89cc5d51a23e659fb7e31d5a3e4d7c
2023-03-08 03:13:27 +00:00
Zheng Pan
ec01260b28
Install insmod config file to vendor_dlkm/etc am: b481660643
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/21685580
Change-Id: Ifc6ba5f96e2f1f0b60dffd2292f507b22a3a66b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 21:53:27 +00:00
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
edfa38f2e0
Merge "move camera dump to gs-common" into udc-dev am: 608ff36086
am: dfbc066486
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/21692922
Change-Id: I1d92a7525ccfa1bf1760038eae1ede1334200ccb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 00:40:20 +00:00
Adam Shih
bb98c5bfbb
Merge "move camera dump to gs-common" into udc-dev am: 608ff36086
am: cd1d455111
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/21692922
Change-Id: I35f25cf72d71c937556e28de9fb904b6da0957bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 00:39:47 +00: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
cd1d455111
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: I9eacac14d0a02ddd70c11fede4afa04dff6cef64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 00:03:59 +00:00
Adam Shih
2408e6ba92
Merge "Move common display dump to gs-common" into udc-dev am: f122db3f24
am: 59e7623ba5
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/21644567
Change-Id: I5e83b5fa49327407802f8c794c99bd42f6b99b57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-06 23:47:57 +00:00
Adam Shih
3cf0dd1bf9
Merge "Move common display dump to gs-common" into udc-dev am: f122db3f24
am: e4cfc458ef
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/21644567
Change-Id: If75f0e9e618d5182546d8f63291a87e2ff56ebca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-06 23:45:45 +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
e4cfc458ef
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: Ia1f6e21aee75761b200b12c8a16b8a995511265c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-06 23:09:17 +00:00
Adam Shih
f122db3f24
Merge "Move common display dump to gs-common" into udc-dev
2023-03-06 22:27:50 +00:00
Sayanna Chandula
651be6db7c
Merge "thermal: enable warm_reset on thermal shutdown" into udc-dev am: 00064c8005
am: ae0260c630
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/21757783
Change-Id: I2e93630555f0a084256edfccbc1422c824aec31c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-06 21:26:27 +00:00
Sayanna Chandula
0ad37f53e3
Merge "thermal: enable warm_reset on thermal shutdown" into udc-dev am: 00064c8005
am: 7726f58fee
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/21757783
Change-Id: If35d531bf3937141fdeb711166be22e790031702
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-06 21:24:58 +00:00
Sayanna Chandula
ae0260c630
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: Iebfb0bed61032638fb7a30b6a584bb28ece9fd03
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-06 20:46:57 +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
b5c970ee24
Merge "Move modem dump log to gs-common" into udc-dev am: 5c2d07e775
am: 5acbf82582
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/21692921
Change-Id: I5944cb8c76157b2a987e22d130a02fb55ef2e542
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-06 08:36:40 +00:00
Adam Shih
2b76ffcd93
Merge "Move modem dump log to gs-common" into udc-dev am: 5c2d07e775
am: 94963243c4
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/21692921
Change-Id: I260200248c41036faf3408f2dc00a8941bdba402
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-06 08:35:53 +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
5acbf82582
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: Ia589133e5ea4342c9c9d7f42848e2093ed04fac9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-06 08:03:16 +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
5e64c99647
Revert "Revert "zuma: update AIDL IGoogleBattery manifest version to 2"" am: 5d02637b59
am: 5d29b448fd
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/21781456
Change-Id: Ib08e4ba234321ff66dd5562816c80887bab5cc16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-06 03:28:01 +00:00
Jack Wu
2d58acd8c0
Revert "Revert "zuma: update AIDL IGoogleBattery manifest version to 2"" am: 5d02637b59
am: 11f215f2f8
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/21781456
Change-Id: I46457dab6a6eb80b18197fec66d1885e6ec85ebc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-06 03:25:25 +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
5d29b448fd
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: I8c6dfbaa82b76d80399296abc946f8b1455a2f85
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-06 02:50:41 +00:00
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
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
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
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
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