TreeHugger Robot
b7dfb4d86f
Merge "thermal: allow the write permission for group" into udc-dev am: 552f4c278f
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/22218402
Change-Id: Ib67689802eef6c4dc998b7554fedcd7cd8f11c64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-28 23:03:02 +00:00
TreeHugger Robot
847031e1a8
Merge "thermal: allow the write permission for group" into udc-dev am: 552f4c278f
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/22218402
Change-Id: I9ed2f19888ad15bdd74372b89868d16ebe1b8191
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-28 23:01:30 +00:00
TreeHugger Robot
552f4c278f
Merge "thermal: allow the write permission for group" into udc-dev
2023-03-28 22:36:44 +00:00
Cody Heiner
cfe1649fcd
Merge "Update com.google.input version in manifest" into udc-dev am: 2ac4f83748
am: 1d27063fa7
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/21686241
Change-Id: I7acea2675e90f6c917f7a8d922d1d04c823e9982
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-28 21:47:25 +00:00
Cody Heiner
98595458b4
Merge "Update com.google.input version in manifest" into udc-dev am: 2ac4f83748
am: 1d27063fa7
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/21686241
Change-Id: I90718758ff3193fbb0ee848edfd70356663bc872
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-28 21:30:12 +00:00
Cody Heiner
0cee4931be
Merge "Update com.google.input version in manifest" into udc-dev am: 2ac4f83748
am: 721c60c9ed
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/21686241
Change-Id: Ic986f28e5fa20164e1abbe1fbdd44f1c9db13e10
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-28 21:30:06 +00:00
Cody Heiner
721c60c9ed
Merge "Update com.google.input version in manifest" into udc-dev am: 2ac4f83748
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/21686241
Change-Id: Ic351272330438ac846436f5f0f798f4acd259e09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-28 21:10:46 +00:00
Cody Heiner
1d27063fa7
Merge "Update com.google.input version in manifest" into udc-dev am: 2ac4f83748
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/21686241
Change-Id: Ia3f605213e804ab48ec22b968b9f4af4dad36228
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-28 20:56:22 +00:00
Cody Heiner
2ac4f83748
Merge "Update com.google.input version in manifest" into udc-dev
2023-03-28 20:20:46 +00:00
Cody Heiner
98d00e697e
Update com.google.input version in manifest
...
Test: Previously failing AOSP presubmit tests pass.
Bug: 271227149
Change-Id: I3de2ca508861675f9c5977f989a5dbe19f016902
2023-03-28 20:16:45 +00:00
Bruno BELANYI
c438c66fe0
Fix mali memory protection sysprop names
...
The previous patch did not use the `base_*` prefix, meaning the
driver kept using the default configuration.
Bug: b/272740524
Test: CtsDeqpTestCases (dEQP-VK.protected_memory.stack.stacksize_*)
Change-Id: I87f3e4ce5734ca213c399969f7f4ddec9e62a707
2023-03-28 11:04:15 +00:00
Adam Shih
e5ab3a8d71
Move pixel dumpstate to gs-common
...
Bug: 240530709
Test: adb bugreport
Change-Id: Ief9dc020bad3ab6a37c81161121f9424fd4ddff5
Merged-In: I70a1cd1a2a2b78b043f3c7fa8ff47f2fec75e078
(cherry picked from commit 72a8053cd6
)
2023-03-27 17:49:52 +00:00
Adam Shih
d294355e9b
[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: Ib6bebf5db0e196da2a50b9e8ccc01dc9565ecef4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-24 07:08:21 +00:00
Automerger Merge Worker
4daedb8feb
Merge "[automerger skipped] Move pixel dumpstate to gs-common am: 72a8053cd6
-s ours am: 1262698bad
-s ours"
2023-03-24 07:05:47 +00:00
Adam Shih
31c156ac31
[automerger skipped] Move pixel dumpstate to gs-common am: 72a8053cd6
-s ours am: 1262698bad
-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: Ib485a0ceb5089c17a98653ce6721a5c794c05501
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-24 07:05:35 +00:00
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