Robin Peng
cd077cfe8a
do not mount the debugfs on userdebug builds am: d5f885d7ce
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/24185624
Change-Id: If6b2474c4d59380978ced77b1a7a2e71d5798dcd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-26 01:23:19 +00:00
Jason Chiu
10adae73cf
Merge changes from topic "bootctrl_aidl_zuma" into udc-d1-dev am: bdb2edd63c
am: eb466b88cf
am: 69ef7940b8
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/24142798
Change-Id: I04e57d49f2db7a7a791f26f7a55f9f9aa15e7c2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-25 20:39:16 +00:00
Jason Chiu
e5defce8fb
zuma: update manifest HAL android.hardware.boot from hidl 1.2 to aidl am: c9cc7c3c68
am: 47d9508973
am: f5a8ee7f53
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/24142797
Change-Id: I82f7cf5a899de337c9afbd46f90bcbe6b814f204
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-25 20:39:13 +00:00
Jason Chiu
81cdddec8d
zuma:interfaces:boot: add aidl interface support am: 193e5e8216
am: 191f174cb1
am: 6c9355e2ee
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/24142796
Change-Id: Ib2b534fc033b0469e2738d706445ceb82585fc74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-25 20:39:11 +00:00
Manish Kushwaha
3a2fc4acea
Merge "update aoc node syspath for p23" into udc-d1-dev am: b6988b3a51
am: 95ed80d5ed
am: 8d37602acf
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/24132973
Change-Id: I78d7e2a2371e321375a7a0db0a4bf9f8c4d107d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-25 20:38:50 +00:00
Ilya Matyukhin
eb3e3b57a8
Merge "Bump IDebugManager version to 4" into udc-qpr-dev am: f9496e29df
am: 7004351652
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/23923812
Change-Id: I03e114990822c5c552a2022bf28ccff7bafa0723
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-25 20:38:26 +00:00
Renato Grottesi
1c34dc162f
[automerger skipped] Merge "Remove settings for old ArmNN HIDL backend" into udc-d1-dev am: 18dd617a65
am: 062def3b10
am: 5712371fa8
-s ours
...
am skip reason: Merged-In I57f807934ca219460a4e589b899f933115718a70 with SHA-1 2697e86201
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/24144073
Change-Id: I1eaaa794bc5a6279295b37d5c57ebc530ef8baf9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-25 20:04:13 +00:00
Jason Chiu
69ef7940b8
Merge changes from topic "bootctrl_aidl_zuma" into udc-d1-dev am: bdb2edd63c
am: eb466b88cf
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/24142798
Change-Id: I783acc7d2b817eccc4d3b2b10f92cdccd5cc0d63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-25 19:41:49 +00:00
Jason Chiu
f5a8ee7f53
zuma: update manifest HAL android.hardware.boot from hidl 1.2 to aidl am: c9cc7c3c68
am: 47d9508973
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/24142797
Change-Id: I5b3d536d0ea46bf7bb645f02f24d77fa9aafa47d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-25 19:41:47 +00:00
Jason Chiu
6c9355e2ee
zuma:interfaces:boot: add aidl interface support am: 193e5e8216
am: 191f174cb1
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/24142796
Change-Id: Icb27717857078285f3f5449ce175c8d8bf241b11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-25 19:41:45 +00:00
Manish Kushwaha
8d37602acf
Merge "update aoc node syspath for p23" into udc-d1-dev am: b6988b3a51
am: 95ed80d5ed
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/24132973
Change-Id: Ifc1f210d6dd10f672110fc133c2db44998cf10bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-25 19:38:17 +00:00
Ilya Matyukhin
7004351652
Merge "Bump IDebugManager version to 4" into udc-qpr-dev am: f9496e29df
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/23923812
Change-Id: I0604b6ad6895993f36aac0f375216058799a4135
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-25 19:37:11 +00:00
Renato Grottesi
cbed0156a8
Merge "Remove settings for old ArmNN HIDL backend" into udc-d1-dev am: 18dd617a65
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/24059134
Change-Id: I822e7fa2996403116dee0caea15c189c9dc29c56
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Merged-In: I57f807934ca219460a4e589b899f933115718a70
2023-07-25 15:14:38 +00:00
Renato Grottesi
5712371fa8
Merge "Remove settings for old ArmNN HIDL backend" into udc-d1-dev am: 18dd617a65
am: 062def3b10
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/24059134
Change-Id: I1faf1b926c794aed92e1aca3a3018c99c27bbaac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Merged-In: I57f807934ca219460a4e589b899f933115718a70
2023-07-25 06:39:24 +00:00
Robin Peng
d5f885d7ce
do not mount the debugfs on userdebug builds
...
Bug: 278988913
Change-Id: I5c703310a4f82acf52fad87854682ca6e668d99b
Signed-off-by: Robin Peng <robinpeng@google.com>
2023-07-25 04:05:57 +00:00
Priyanka Advani
fe585e6130
Merge "Revert "Use graphics allocator 2"" into main
2023-07-24 21:33:28 +00:00
Priyanka Advani
5c5e1b804f
Revert "Use graphics allocator 2"
...
Revert submission 23772493-allocator-aidl2
Reason for revert: Probable culprit for b/292565867, b/292569168
Reverted changes: /q/submissionid:23772493-allocator-aidl2
Change-Id: Ib177d152013e8e677a4cfc55cf6256128750591f
2023-07-24 20:11:50 +00:00
Devika Krishnadas
63376f7f89
Merge "Use graphics allocator 2" into main
2023-07-24 17:40:34 +00:00
Android Build Coastguard Worker
f9a1b1637d
Snap for 10542431 from eb466b88cf
to udc-qpr1-release
...
Change-Id: I9d6e71e6fa0cae14e39541c6ce071bca62690413
2023-07-22 01:07:44 +00:00
Jason Chiu
eb466b88cf
Merge changes from topic "bootctrl_aidl_zuma" into udc-d1-dev am: bdb2edd63c
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/24142798
Change-Id: I94ce59f092a289e42bf96f7485a22aeea614196f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-21 02:59:18 +00:00
Jason Chiu
47d9508973
zuma: update manifest HAL android.hardware.boot from hidl 1.2 to aidl am: c9cc7c3c68
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/24142797
Change-Id: I1b2981e5fa311e7781afc2bc08058acd00a7791a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-21 02:59:15 +00:00
Jason Chiu
191f174cb1
zuma:interfaces:boot: add aidl interface support am: 193e5e8216
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/24142796
Change-Id: Iad931c04fa786d3abcc0a44237a08779e3fbfa87
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-21 02:59:13 +00:00
Jason Chiu
bdb2edd63c
Merge changes from topic "bootctrl_aidl_zuma" into udc-d1-dev
...
* changes:
zuma: use android.hardware.boot aidl interface
zuma: update manifest HAL android.hardware.boot from hidl 1.2 to aidl
zuma:interfaces:boot: add aidl interface support
2023-07-21 02:16:41 +00:00
Manish Kushwaha
95ed80d5ed
Merge "update aoc node syspath for p23" into udc-d1-dev am: b6988b3a51
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/24132973
Change-Id: I0a964023dfd7a3387f018c19e31c77dccdde1cf7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-21 00:24:34 +00:00
Manish Kushwaha
b6988b3a51
Merge "update aoc node syspath for p23" into udc-d1-dev
2023-07-20 23:44:07 +00:00
Android Build Coastguard Worker
cd99f013e9
Snap for 10535291 from f9496e29df
to udc-qpr1-release
...
Change-Id: Ia5b4543dbe5ebdd89161d1a7527f0d03a437be15
2023-07-20 23:03:23 +00:00
Devika Krishnadas
c2abed3500
Use graphics allocator 2
...
Bug: 287353739
Test: atest VtsHalGraphicsMapperV4_0TargetTest
Change-Id: I080045d75273fcf01d9129dee85fdf3c7b801117
Signed-off-by: Devika Krishnadas <kdevika@google.com>
2023-07-20 20:49:02 +00:00
Ilya Matyukhin
f9496e29df
Merge "Bump IDebugManager version to 4" into udc-qpr-dev
2023-07-20 18:58:39 +00:00
Jason Chiu
309ea3aa47
zuma: use android.hardware.boot aidl interface
...
Bug: 282670401
Change-Id: I3b2d4f8ad2ac68c2bc730df1b75d2a3b96419b39
Signed-off-by: Jason Chiu <jasoncschiu@google.com>
2023-07-20 13:56:04 +00:00
Jason Chiu
c9cc7c3c68
zuma: update manifest HAL android.hardware.boot from hidl 1.2 to aidl
...
Bug: 282670401
Change-Id: Ifb24eba785a6609d2aef8612b6631bb0baee99a2
Signed-off-by: Jason Chiu <jasoncschiu@google.com>
2023-07-20 13:55:55 +00:00
Jason Chiu
193e5e8216
zuma:interfaces:boot: add aidl interface support
...
bootctrl aidl interface is based on hidl 1.2 interface implementation
code and migrate to aidl interface
Bug: 282670401
Test:
- boot to home
- OTA successfully in Recovery mode
- OTA successfully in OS mode
Change-Id: I5221ddc997d06dc24e46816885d617f4cf193502
Signed-off-by: Jason Chiu <jasoncschiu@google.com>
2023-07-20 07:34:32 +00:00
Renato Grottesi
062def3b10
Merge "Remove settings for old ArmNN HIDL backend" into udc-d1-dev am: 18dd617a65
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/24059134
Change-Id: Ice9b19af20fefd0f024ad3f9ef47c4509f364a4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-20 07:28:18 +00:00
Renato Grottesi
18dd617a65
Merge "Remove settings for old ArmNN HIDL backend" into udc-d1-dev
2023-07-20 06:37:16 +00:00
Android Build Coastguard Worker
a173cd27bd
Snap for 10527654 from 238a3f0b0a
to udc-qpr1-release
...
Change-Id: Ib910bc37a310d90195b30b50dcd9c2ac1fef4ec9
2023-07-19 23:03:15 +00:00
Manish Kushwaha
bb88de98d1
update aoc node syspath for p23
...
Bug: 291703347
Test: presubmit
Change-Id: Ifd1abc8fe9be19962cbf0b6c0b2de33ec3e38b30
2023-07-19 10:42:07 -07:00
Treehugger Robot
70c8252de9
Merge "init: Remove SICD in charger mode" into udc-d1-dev am: 351d404ec5
am: 238a3f0b0a
am: 0c6d683e4e
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/24109626
Change-Id: I9220fc8d61096a1471ecb95e97152cfaeae9a52a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-19 03:58:32 +00:00
Treehugger Robot
2f0380fb23
Merge "init: Remove SICD in charger mode" into udc-d1-dev am: 351d404ec5
am: 9d46419a59
am: e9bb34e3b6
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/24109626
Change-Id: I9ae457192021654e647cea885a0f444d964d5464
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-19 03:41:15 +00:00
Treehugger Robot
0c6d683e4e
Merge "init: Remove SICD in charger mode" into udc-d1-dev am: 351d404ec5
am: 238a3f0b0a
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/24109626
Change-Id: Iada29666b6a2595d662813f3b6df11246beacc7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-19 02:51:02 +00:00
Treehugger Robot
e9bb34e3b6
Merge "init: Remove SICD in charger mode" into udc-d1-dev am: 351d404ec5
am: 9d46419a59
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/24109626
Change-Id: Ie3d127a79ac7669b82f071fbc8ee51015dd1d195
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-19 02:50:20 +00:00
Treehugger Robot
238a3f0b0a
Merge "init: Remove SICD in charger mode" into udc-d1-dev am: 351d404ec5
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/24109626
Change-Id: I9797e9629f244a8d7516b84a440e7dbde7c9f28f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-19 02:04:14 +00:00
Treehugger Robot
9d46419a59
Merge "init: Remove SICD in charger mode" into udc-d1-dev am: 351d404ec5
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/24109626
Change-Id: Id456489d01a337c9e212387fb49a53ec6119b864
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-19 02:03:49 +00:00
Treehugger Robot
351d404ec5
Merge "init: Remove SICD in charger mode" into udc-d1-dev
2023-07-19 01:22:43 +00:00
Treehugger Robot
40074ef264
Merge "EGL: Configure multifile cache" into udc-d1-dev am: 2af6795812
am: 98c281fd21
am: 5c3fdc3c6c
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/24084860
Change-Id: I3dfc3281eca6b165e6d0a3a699ff8f0d31e2083e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-18 21:26:34 +00:00
Treehugger Robot
8a3cdb930e
Merge "EGL: Configure multifile cache" into udc-d1-dev am: 2af6795812
am: 4d4c62eabf
am: 1ff15fa443
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/24084860
Change-Id: I4039bf87dc2e57778dd02c76478a199a327fa450
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-18 21:26:24 +00:00
Treehugger Robot
5c3fdc3c6c
Merge "EGL: Configure multifile cache" into udc-d1-dev am: 2af6795812
am: 98c281fd21
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/24084860
Change-Id: I86817e20b04b931900820277c56fda0f9f14cdd8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-18 20:40:33 +00:00
Treehugger Robot
1ff15fa443
Merge "EGL: Configure multifile cache" into udc-d1-dev am: 2af6795812
am: 4d4c62eabf
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/24084860
Change-Id: I3152e004eeec8339f3ec05d43252a278559f696c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-18 20:39:32 +00:00
Treehugger Robot
4d4c62eabf
Merge "EGL: Configure multifile cache" into udc-d1-dev am: 2af6795812
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/24084860
Change-Id: I8ddcafad2bc30f5f00d47e37b685c5796fa4459d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-18 19:50:50 +00:00
Treehugger Robot
98c281fd21
Merge "EGL: Configure multifile cache" into udc-d1-dev am: 2af6795812
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/24084860
Change-Id: Ieae573ae9ea9fefd771de3d301f7031b46c2ee30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-18 19:49:18 +00:00
Treehugger Robot
2af6795812
Merge "EGL: Configure multifile cache" into udc-d1-dev
2023-07-18 19:06:15 +00:00
Jason(HeWei) Sung
5627d40608
init: Remove SICD in charger mode
...
Bug: 290861377
Change-Id: I8fb2b67dd84af9713bcd36819ecaa9dcc4000ccb
Signed-off-by: Jason(HeWei) Sung <jasonsung@google.com>
2023-07-18 12:44:39 +08:00