Adam Shih
6a085aab3c
[automerger skipped] Move pixel dumpstate to gs-common am: 72a8053cd6
-s ours am: 38d3810f2b
-s ours
...
am skip reason: Merged-In I70a1cd1a2a2b78b043f3c7fa8ff47f2fec75e078 with SHA-1 187ebac0b8
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/22236028
Change-Id: I344092ad5a42d1ec790770c953a0f04d40ba6c76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-24 07:05:28 +00:00
Adam Shih
38d3810f2b
[automerger skipped] Move pixel dumpstate to gs-common am: 72a8053cd6
-s ours
...
am skip reason: Merged-In I70a1cd1a2a2b78b043f3c7fa8ff47f2fec75e078 with SHA-1 187ebac0b8
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/22236028
Change-Id: I5d1a95b7d64d9c1e37df07e53644a0c7510ee82e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-24 06:23:07 +00:00
Adam Shih
1262698bad
[automerger skipped] Move pixel dumpstate to gs-common am: 72a8053cd6
-s ours
...
am skip reason: Merged-In I70a1cd1a2a2b78b043f3c7fa8ff47f2fec75e078 with SHA-1 187ebac0b8
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/22236028
Change-Id: I4fcdb68d95c43b4edf84fb129a6926275431145b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-24 06:23:03 +00:00
Adam Shih
72a8053cd6
Move pixel dumpstate to gs-common
...
Bug: 240530709
Test: adb bugreport
Change-Id: Ief9dc020bad3ab6a37c81161121f9424fd4ddff5
Merged-In: I70a1cd1a2a2b78b043f3c7fa8ff47f2fec75e078
2023-03-24 02:49:23 +00:00
Mingguang Xu
774f5ce7c7
zuma: add Twoshay's IGrilAntennaTuningService to manifest
...
Fixed service not found:
ServiceManagerCppClient: Failed to getService in waitForService for com.google.input.algos.gril.IGrilAntennaTuningService/default: Status(-129, EX_TRANSACTION_FAILED): 'FAILED_TRANSACTION: '
Bug: 268218130
Test: manual
Change-Id: I707cb6c0996f07c3503ab45e4b8ed7a01d5331db
Signed-off-by: Mingguang Xu <mingguangxu@google.com>
2023-03-23 23:46:50 +00:00
TreeHugger Robot
4f4f0a5215
Merge "trusty: Add trusty_stats_test" into udc-d1-dev am: 6ec8bfac85
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/22212682
Change-Id: Iff1a73deebf3701b06c7abf9aba9e90e17cbacbb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 17:00:42 +00:00
TreeHugger Robot
fac1766294
Merge "Add metrics to the zuma makefile" into udc-d1-dev am: 94da290d58
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/22212075
Change-Id: Ifc7e5bc2a94760eb7ebc4783d04e31bfa4aaaa04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 17:00:37 +00:00
TreeHugger Robot
468bd0a0e0
Merge "trusty: Add trusty_stats_test" into udc-d1-dev am: 6ec8bfac85
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/22212682
Change-Id: I9a1798804da4e0b694da338016baf589bcd4c38c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 16:59:38 +00:00
TreeHugger Robot
4b2c91633f
Merge "Add metrics to the zuma makefile" into udc-d1-dev am: 94da290d58
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/22212075
Change-Id: If2e71a3ddff660bb1fa351dfab1ce3e58c7454c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 16:59:36 +00:00
TreeHugger Robot
6ec8bfac85
Merge "trusty: Add trusty_stats_test" into udc-d1-dev
2023-03-23 16:19:47 +00:00
TreeHugger Robot
94da290d58
Merge "Add metrics to the zuma makefile" into udc-d1-dev
2023-03-23 16:19:47 +00:00
Mark Chang
a53c1573c5
Merge "Add new IScreenProtectorDetectorService to manifest." into udc-d1-dev am: 693f2e850e
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/22185175
Change-Id: I0939a307cdaf6ae8c98dae4950df39310cc49753
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 09:04:04 +00:00
TreeHugger Robot
c48639136d
Merge "Revert "Move pixel dumpstate to gs-common"" into udc-dev am: af2c222690
am: 2dbc937331
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/22215370
Change-Id: I1a6d4300d49eaee493016ccf26e7121ee813daeb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 09:03:47 +00:00
TreeHugger Robot
4f331656d6
[automerger skipped] Merge "Revert "Move pixel dumpstate to gs-common"" into udc-dev am: af2c222690
am: 4a3d450cde
-s ours
...
am skip reason: Merged-In I70a1cd1a2a2b78b043f3c7fa8ff47f2fec75e078 with SHA-1 eb06b6db9e
is already in history. Merged-In was found from reverted change.
Reverted change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/22185167
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/22215370
Change-Id: I4e291533f98b7c8ded83d595f633ba541f84cda9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 09:01:05 +00:00
Mark Chang
657b2d227f
Merge "Add new IScreenProtectorDetectorService to manifest." into udc-d1-dev am: 693f2e850e
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/22185175
Change-Id: Iaa54d5d8497598da60b3e2e378eb4c6be1335fd0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 09:00:24 +00:00
TreeHugger Robot
807f814daf
[automerger skipped] Merge "Revert "Move pixel dumpstate to gs-common"" into udc-dev am: af2c222690
am: 2dbc937331
-s ours
...
am skip reason: Merged-In I70a1cd1a2a2b78b043f3c7fa8ff47f2fec75e078 with SHA-1 eb06b6db9e
is already in history. Merged-In was found from reverted change.
Reverted change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/22185167
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/22215370
Change-Id: I3f634a4285db685de82668ee3b4044d2ad313984
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 08:59:54 +00:00
Mark Chang
693f2e850e
Merge "Add new IScreenProtectorDetectorService to manifest." into udc-d1-dev
2023-03-23 08:30:24 +00:00
TreeHugger Robot
4a3d450cde
Merge "Revert "Move pixel dumpstate to gs-common"" into udc-dev am: af2c222690
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/22215370
Change-Id: I5a15b1aa6b210e6a9cac3029c8890c374b97eea7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 08:08:02 +00:00
TreeHugger Robot
2dbc937331
Merge "Revert "Move pixel dumpstate to gs-common"" into udc-dev am: af2c222690
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/22215370
Change-Id: I9c3ef84f72b1bdbea9358bbc75688cc2fd8f65d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 08:07:37 +00:00
TreeHugger Robot
af2c222690
Merge "Revert "Move pixel dumpstate to gs-common"" into udc-dev
2023-03-23 07:24:01 +00:00
TeYuan Wang
1c444398d5
thermal: allow the write permission for group
...
Bug: 273344931
Test: Make sure all the thermalHAL throttling can be cleared w/ the cmd below:
- adb shell setprop vendor.thermal.virtualskin.severity 4
- adb shell setprop persist.vendor.disable.thermal.control 1
Change-Id: I0a80725362efe5d9c7f48fd11c46f987c350f983
2023-03-23 15:08:36 +08:00
Adam Shih
978be3408d
[automerger skipped] Merge "Move pixel dumpstate to gs-common" into udc-dev am: eadbbdc576
am: c48bcb124b
-s ours
...
am skip reason: Merged-In I70a1cd1a2a2b78b043f3c7fa8ff47f2fec75e078 with SHA-1 187ebac0b8
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/22185167
Change-Id: I1231e2e8a48278d8210ac2d50829e184835f6061
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 06:48:47 +00:00
Adam Shih
8381b7a170
Merge "Move pixel dumpstate to gs-common" into udc-dev am: eadbbdc576
am: c48bcb124b
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/22185167
Change-Id: I67e38fdd2bfbd5e55a94004ba3121655f0d51788
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 06:30:40 +00:00
Adam Shih
d1bce67e32
[automerger skipped] Merge "Move pixel dumpstate to gs-common" into udc-dev am: eadbbdc576
am: 3721a93701
-s ours
...
am skip reason: Merged-In I70a1cd1a2a2b78b043f3c7fa8ff47f2fec75e078 with SHA-1 eb06b6db9e
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/22185167
Change-Id: I4a6afadff264a9680d4c95c4e32cf143aa3345f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 06:27:48 +00:00
Wilson Sung
e41debd8d2
Revert "Move pixel dumpstate to gs-common"
...
Revert submission 22188471-dumpstate aidl
Reason for revert: Build break
Reverted changes: /q/submissionid:22188471-dumpstate+aidl
Bug: 274858145
Change-Id: I4fcd0ee39b9448e2b73bb0ab6891b2a5fcd6e566
2023-03-23 05:58:08 +00:00
Adam Shih
3721a93701
Merge "Move pixel dumpstate to gs-common" into udc-dev am: eadbbdc576
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/22185167
Change-Id: Iee39b451a943455ee691cebc9055d04b3d7d7559
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 05:53:01 +00:00
Adam Shih
c48bcb124b
Merge "Move pixel dumpstate to gs-common" into udc-dev am: eadbbdc576
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/22185167
Change-Id: Icee0c080238a8d881e0608c5f9f767ba3f5d3340
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 05:52:55 +00:00
Adam Shih
eadbbdc576
Merge "Move pixel dumpstate to gs-common" into udc-dev
2023-03-23 04:39:46 +00:00
Adam Shih
cb15251d67
Merge "Move pixel dumpstate to gs-common"
2023-03-23 02:29:30 +00:00
Armelle Laine
fbbbd48e01
trusty: Add trusty_stats_test
...
Test: /data/nativetest64/vendor/trusty_stats_test/trusty_stats_test
Bug: 259517277
Change-Id: I40eba69428df1b577456ab6a79f5ffc634fec9ac
(cherry picked from commit 473839b618
)
2023-03-23 00:15:46 +00:00
Armelle Laine
40ebfd59aa
Add metrics to the zuma makefile
...
Bug: 259517277
Test: TBD
Change-Id: I4423c4df03a34d68dcec81a1ffc1f00e28fb685b
(cherry picked from commit 43f7439f43
)
2023-03-23 00:14:12 +00:00
Chris Paulo
a06b7609d4
Merge "BoardConfig: Add haptics actuator model config and adaptive haptics config" into udc-dev am: 89d4195c08
am: fb56db8722
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/21806188
Change-Id: Ifc92ea9a8c8922bc21178947670e05602f686153
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-22 23:24:15 +00:00
Chris Paulo
57f3d30bb3
Merge "BoardConfig: Add haptics actuator model config and adaptive haptics config" into udc-dev am: 89d4195c08
am: fb56db8722
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/21806188
Change-Id: I8bf8356b261e3a11c6985a6a21be7a9974e76fb5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-22 23:17:25 +00:00
Chris Paulo
b13afd0ce4
Merge "BoardConfig: Add haptics actuator model config and adaptive haptics config" into udc-dev am: 89d4195c08
am: 05d1614daf
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/21806188
Change-Id: I444da59d359de8fb23dd870276b40d517ece425d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-22 23:17:21 +00:00
Chris Paulo
fb56db8722
Merge "BoardConfig: Add haptics actuator model config and adaptive haptics config" into udc-dev am: 89d4195c08
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/21806188
Change-Id: I97a5bec365ecc4b2c728f4f83b32b85c9ca7d49a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-22 22:37:57 +00:00
Chris Paulo
05d1614daf
Merge "BoardConfig: Add haptics actuator model config and adaptive haptics config" into udc-dev am: 89d4195c08
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/21806188
Change-Id: I3ab9093c920f9f2f1fcdd25bb947899bf504a993
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-22 22:37:55 +00:00
Chris Paulo
89d4195c08
Merge "BoardConfig: Add haptics actuator model config and adaptive haptics config" into udc-dev
2023-03-22 21:58:50 +00:00
Andrei Homescu
f05f42b7db
Merge changes I40eba694,I4423c4df
...
* changes:
trusty: Add trusty_stats_test
Add metrics to the zuma makefile
2023-03-22 18:41:32 +00:00
Mark Chang
bcd8d85776
Add new IScreenProtectorDetectorService to manifest.
...
Fixes service not found:
servicemanager: Could not find com.google.input.algos.spd.IScreenProtectorDetectorService/default in the VINTF manifest.
bug: 260302317
Test: Boot ok and service found.
Change-Id: I47e6c5e41fd665310f2f7e6e09c15f1f21c1d940
Signed-off-by: Mark Chang <changmark@google.com>
2023-03-22 12:01:24 +00:00
Adam Shih
187ebac0b8
Move pixel dumpstate to gs-common
...
Bug: 240530709
Test: adb bugreport
Change-Id: I70a1cd1a2a2b78b043f3c7fa8ff47f2fec75e078
Merged-In: I70a1cd1a2a2b78b043f3c7fa8ff47f2fec75e078
2023-03-22 05:06:42 +00:00
Adam Shih
eb06b6db9e
Move pixel dumpstate to gs-common
...
Bug: 240530709
Test: adb bugreport
Change-Id: I70a1cd1a2a2b78b043f3c7fa8ff47f2fec75e078
2023-03-22 12:59:10 +08:00
Mahesh Kallelil
c2ccdbc569
Assign owner/group for cp_temp after the kernel module is loaded. am: 8eab233dba
am: 82ce082363
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/22191208
Change-Id: I4bf1349f29a3b9612a0dc18507d6d8c04d166539
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-22 04:45:23 +00:00
Mahesh Kallelil
d3fa152d5a
Assign owner/group for cp_temp after the kernel module is loaded. am: 8eab233dba
am: 148065f3b5
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/22191208
Change-Id: Ifb69c3417ea9f9e86ad82204331329e287d16189
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-22 04:42:48 +00:00
Mahesh Kallelil
b66ffa4dc4
Assign owner/group for cp_temp after the kernel module is loaded. am: 8eab233dba
am: 82ce082363
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/22191208
Change-Id: I4aea5dbdfc95d33249f84ed60f98ed60cf498951
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-22 04:41:14 +00:00
Mahesh Kallelil
82ce082363
Assign owner/group for cp_temp after the kernel module is loaded. am: 8eab233dba
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/22191208
Change-Id: I3cf87301268d976dc0d20e528fe377db25973607
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-22 04:07:40 +00:00
Mahesh Kallelil
148065f3b5
Assign owner/group for cp_temp after the kernel module is loaded. am: 8eab233dba
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/22191208
Change-Id: If44648832358a11ea0f08b39853c2e25116231d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-22 04:07:10 +00:00
Mahesh Kallelil
8eab233dba
Assign owner/group for cp_temp after the kernel module is loaded.
...
The chown operation on the cp_temp sysfs attribute needs to happen after
the cp_thermal_zone driver has been loaded by the insmod_sh service.
If not, the owner/group won't be updated and after the driver gets
loaded, cp_temp will default to root/root. Hence, we are moving this
operation from init to the post-fs-data stage.
Test: Verified owner/group for the sysfs attribute
Bug: 267485434
Change-Id: Ib463dd5f2de332164714a77bdb0302afeaad5217
Signed-off-by: Mahesh Kallelil <kallelil@google.com>
2023-03-21 18:30:02 -07:00
Joerg Wagner
472aa0f4af
Merge "Update Mali DDK to r40 : Sysprop configuration settings" into udc-d1-dev am: e64fbfc479
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/21749920
Change-Id: Ic286e7907a690e1c4319f800717e58a983e0e17a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-21 15:14:05 +00:00
Joerg Wagner
a0b00dd5f8
[automerger skipped] Merge "Update Mali DDK to r40 : Sysprop configuration settings" into udc-d1-dev am: e64fbfc479
-s ours
...
am skip reason: Merged-In I9549304a70277e00202680885c596bec2dc21bcf with SHA-1 5c92150482
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/21749920
Change-Id: I315a84b8f9622782c0fa72a725ce55b06232223f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-21 15:09:41 +00:00
Jörg Wagner
083bf14d96
[automerger skipped] Update Mali DDK to r40 : Sysprop configuration settings am: 1707e8773e
-s ours
...
am skip reason: Merged-In I9549304a70277e00202680885c596bec2dc21bcf with SHA-1 5c92150482
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/21749920
Change-Id: I1a4db56f52b007bb31f60eed124611b86c97e321
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-21 15:09:39 +00:00