Elliott Hughes
38b8d041dc
Track API change.
...
Test: treehugger
Change-Id: Ia93d6a8e00f03a2878f58ec48790ff5054fd6933
2022-01-19 15:43:03 -08:00
Treehugger Robot
e106506ffa
Merge "Add missing header include to libedify" am: 191a9da257
am: 99f1bd6a72
am: 2455ff0b8d
am: 7951feda20
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1930749
Change-Id: I6e2c32957887fe0b993b1777a2b51aa552621bdc
2022-01-14 22:20:18 +00:00
Treehugger Robot
7951feda20
Merge "Add missing header include to libedify" am: 191a9da257
am: 99f1bd6a72
am: 2455ff0b8d
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1930749
Change-Id: I7d48128426f9ab8729ef1ecfb82a087144b82f56
2022-01-14 22:01:45 +00:00
Treehugger Robot
2455ff0b8d
Merge "Add missing header include to libedify" am: 191a9da257
am: 99f1bd6a72
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1930749
Change-Id: If1ff329eecfb3b1da04fe5bdfe61d86c70b533d2
2022-01-14 21:44:35 +00:00
Treehugger Robot
99f1bd6a72
Merge "Add missing header include to libedify" am: 191a9da257
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1930749
Change-Id: Icc5293cbccad9299cc694be88d34339da5564391
2022-01-14 21:25:04 +00:00
Treehugger Robot
191a9da257
Merge "Add missing header include to libedify"
2022-01-14 21:06:48 +00:00
Treehugger Robot
d9c2c0a6a8
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: fda86a9d3d
-s ours am: f25133183a
-s ours am: e46e511459
-s ours am: 6f372cc3b9
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1943646
Change-Id: Ic045c6c9c8872a10172736757bc883df616c5869
2022-01-11 02:02:02 +00:00
Bill Yi
447af79403
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6b7c582de4
-s ours am: f54fdb8448
-s ours am: 75cd1fcd30
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/16592124
Change-Id: I58e18e6ced0d706b25233355dbc1544122ff7e73
2022-01-11 01:55:52 +00:00
Treehugger Robot
6f372cc3b9
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: fda86a9d3d
-s ours am: f25133183a
-s ours am: e46e511459
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1943646
Change-Id: I4b09de57c96fb677795c4815d917e0d34f0a88d7
2022-01-11 01:40:10 +00:00
Treehugger Robot
e46e511459
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: fda86a9d3d
-s ours am: f25133183a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1943646
Change-Id: Ia0fb69b804fdda808cbd10f87bfae21ad84240dc
2022-01-11 01:35:10 +00:00
Bill Yi
75cd1fcd30
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6b7c582de4
-s ours am: f54fdb8448
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/16592124
Change-Id: I45dfaf0d5d820d9141172582235c154ddacc0f75
2022-01-11 01:35:09 +00:00
Treehugger Robot
f25133183a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: fda86a9d3d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1943646
Change-Id: I7acf9e9d52cd64aad0cc293ea56e35baaa4e8607
2022-01-11 01:15:18 +00:00
Bill Yi
f54fdb8448
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6b7c582de4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/16592124
Change-Id: I848e2151d6a7432f9e6603cfc0d78495920d83fb
2022-01-11 01:10:30 +00:00
Treehugger Robot
fda86a9d3d
Merge "Import translations. DO NOT MERGE ANYWHERE"
2022-01-11 00:49:09 +00:00
Bill Yi
e93c95aa15
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I3aa37a2a54caa0974cce0e3ec678845c19e33788
2022-01-10 16:47:44 +00:00
Bill Yi
6b7c582de4
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ib85b44ed4fb7cbbecfb5a3e23691198e424e2046
2022-01-10 05:28:08 +00:00
Bill Yi
3bbfbc1524
[automerger skipped] Merge "Merge sc-qpr1 to aosp-master - DO NOT MERGE" am: db8910bf0c
-s ours am: 3bec84ed54
-s ours am: 1c5681eee8
-s ours am: 83293654d7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1940718
Change-Id: I60d5eb915e8d9b5d801c257ee3804d6db9dcfb80
2022-01-07 18:57:04 +00:00
Bill Yi
83293654d7
[automerger skipped] Merge "Merge sc-qpr1 to aosp-master - DO NOT MERGE" am: db8910bf0c
-s ours am: 3bec84ed54
-s ours am: 1c5681eee8
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1940718
Change-Id: I39a10d5ae21117f15a4eab8c6f8ccb499196b02a
2022-01-07 18:34:08 +00:00
Bill Yi
1c5681eee8
[automerger skipped] Merge "Merge sc-qpr1 to aosp-master - DO NOT MERGE" am: db8910bf0c
-s ours am: 3bec84ed54
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1940718
Change-Id: I2eaaa29dce40e6824144c1289212a0984316e6a7
2022-01-07 18:16:19 +00:00
Bill Yi
3bec84ed54
[automerger skipped] Merge "Merge sc-qpr1 to aosp-master - DO NOT MERGE" am: db8910bf0c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1940718
Change-Id: I95831e167d886f75baf72eddf3caf39525c66ddd
2022-01-07 17:48:49 +00:00
Bill Yi
db8910bf0c
Merge "Merge sc-qpr1 to aosp-master - DO NOT MERGE"
2022-01-07 17:29:11 +00:00
Bill Yi
9ce67b4137
[automerger skipped] Merge SQ1A.220105.002 to stage-aosp-master - DO NOT MERGE am: c1f7e46319
-s ours am: 9d81eb7961
-s ours am: a285af37b7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/16573626
Change-Id: Iadfae6144dc9ed7e175b5eaadc846b8c6523e365
2022-01-07 02:43:07 +00:00
Bill Yi
f368b1564b
Merge sc-qpr1 to aosp-master - DO NOT MERGE
...
Merged-In: I15f31c6b5cb5975d25199a3e9a0d6e22afcf0bd4
Merged-In: I7cff12b3c0b96c818b7e121d2e9038d49aad9886
Change-Id: If7d4e210285bbd21e5f4f2ab4533e16776425c71
2022-01-06 18:27:54 -08:00
Bill Yi
a285af37b7
[automerger skipped] Merge SQ1A.220105.002 to stage-aosp-master - DO NOT MERGE am: c1f7e46319
-s ours am: 9d81eb7961
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/16573626
Change-Id: Ia9b945a7dee267e19ce56e4e906dee7581affec1
2022-01-07 02:22:57 +00:00
Bill Yi
9d81eb7961
[automerger skipped] Merge SQ1A.220105.002 to stage-aosp-master - DO NOT MERGE am: c1f7e46319
-s ours
...
am skip reason: Merged-In I81fb0f956f415014cc6b28f576ee827336277e88 with SHA-1 2ac9924aa9
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/16573626
Change-Id: I7cff12b3c0b96c818b7e121d2e9038d49aad9886
2022-01-07 02:01:46 +00:00
Bill Yi
c1f7e46319
Merge SQ1A.220105.002 to stage-aosp-master - DO NOT MERGE
...
Merged-In: I81fb0f956f415014cc6b28f576ee827336277e88
Change-Id: I15f31c6b5cb5975d25199a3e9a0d6e22afcf0bd4
2022-01-05 20:47:44 -08:00
Treehugger Robot
ea0eb1758f
Merge "Fix wrong key indexes in package verification logs." am: 11563e2721
am: 6e88cc2db0
am: 2ac9924aa9
am: 6581dc4d95
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1933119
Change-Id: I5a215541059f1adb7e341e94d95db05d2a72038d
2021-12-29 20:01:05 +00:00
Treehugger Robot
6581dc4d95
Merge "Fix wrong key indexes in package verification logs." am: 11563e2721
am: 6e88cc2db0
am: 2ac9924aa9
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1933119
Change-Id: I8082eb049f167fae0ce556b5035e986a5d6541a5
2021-12-29 19:42:23 +00:00
Treehugger Robot
2ac9924aa9
Merge "Fix wrong key indexes in package verification logs." am: 11563e2721
am: 6e88cc2db0
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1933119
Change-Id: I81fb0f956f415014cc6b28f576ee827336277e88
2021-12-29 19:25:41 +00:00
Treehugger Robot
6e88cc2db0
Merge "Fix wrong key indexes in package verification logs." am: 11563e2721
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1933119
Change-Id: I8f163a5e5d7209e2ae4a6e65117de2281206bb25
2021-12-29 19:08:20 +00:00
Treehugger Robot
11563e2721
Merge "Fix wrong key indexes in package verification logs."
2021-12-29 18:45:34 +00:00
Jacky Liu
5ffad4b00b
Fix wrong key indexes in package verification logs.
...
If the verification fails with the key, 'continue' will be performed and
the increment of the index at the end of the loop will be skipped.
This CL fixes it.
Test: check the log and see correct key indexes.
Change-Id: I3d1b2b8b4189f5fedbf8828f5e8e0d0b2e277c6a
2021-12-29 12:51:40 +08:00
Jacky Liu
a228c9bc83
Merge "Move package verifier from libinstall to libotautil" am: 86df64785a
am: 31f842f1e6
am: 7c608afa47
am: 2c48bd472b
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1930535
Change-Id: Ia69ca224d64e0f080f88913cf1ed85ec33c3300c
2021-12-24 15:21:10 +00:00
Jacky Liu
2c48bd472b
Merge "Move package verifier from libinstall to libotautil" am: 86df64785a
am: 31f842f1e6
am: 7c608afa47
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1930535
Change-Id: I6417fd6c122e86dbf9655e5524e73691f8320a81
2021-12-24 15:02:42 +00:00
Jacky Liu
7c608afa47
Merge "Move package verifier from libinstall to libotautil" am: 86df64785a
am: 31f842f1e6
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1930535
Change-Id: Id77587d8a06b156dbd37ed73fbf191703eeb7cfc
2021-12-24 14:51:14 +00:00
Jacky Liu
31f842f1e6
Merge "Move package verifier from libinstall to libotautil" am: 86df64785a
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1930535
Change-Id: Ife922e712b4915aa36097f825d863f73e8e0d7dd
2021-12-24 14:39:41 +00:00
Jacky Liu
86df64785a
Merge "Move package verifier from libinstall to libotautil"
2021-12-24 14:27:38 +00:00
Jacky Liu
068329e977
Move package verifier from libinstall to libotautil
...
So it can be used by device-specific codes.
Bug: 184693830
Test: m; atest recovery_unit_test
Change-Id: I5885334c1bd04214c9cc295f2337306261a1735c
2021-12-22 23:31:08 +08:00
Colin Cross
ff48d3de3c
Add missing header include to libedify
...
parser.yy uses va_start and should include stdarg.h.
Bug: 190084016
Test: m USE_HOST_MUSL=true libedify
Change-Id: I2747c1233667717fe0a34050a008370502de184a
2021-12-20 15:41:06 -08:00
Shaju Mathew
775aafeddc
Suppression of socket connect from minadbd (CL 2/2) am: 1b3dcb8549
am: 12f1d2f745
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/16468721
Change-Id: Ia1b1fedc2c302983e40e08e0440b9b57b0f0beeb
2021-12-15 18:46:33 +00:00
Shaju Mathew
12f1d2f745
Suppression of socket connect from minadbd (CL 2/2) am: 1b3dcb8549
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/16468721
Change-Id: Id4fed70b07045a0d2985680e45072aafadf62a9d
2021-12-15 18:27:52 +00:00
TreeHugger Robot
6691b1c095
Merge "minui: Add support for ARGB (LSB alpha)"
2021-12-14 21:01:34 +00:00
Shaju Mathew
1b3dcb8549
Suppression of socket connect from minadbd (CL 2/2)
...
Bug: 201308542
Test: TBD
Ignore-AOSP-First: Security fix.
Signed-off-by: Shaju Mathew <shaju@google.com>
Change-Id: I3418eddbe02eadd5fabf6a930c73edbdb98195f1
2021-12-14 18:36:13 +00:00
Florian Mayer
cf3234a093
[MTE] Add interface to communicate MTE status to bootloader.
...
We can use this interface to instruct the bootloader to either
permanently or only for the next reboot enable MTE for userspace
or kernel.
Bug: 206895651
Change-Id: I7330e43b7c4f94fc5913a7bc0f667b6eab06e111
2021-12-08 18:08:41 -08:00
Yifan Hong
a2462ad9b6
Merge "GetBatteryInfo() also reads AIDL health HAL." am: d33b067f04
am: 9113d57446
am: 905def0b81
am: 28f5881247
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1906334
Change-Id: I7388963d01512dc55a3619603dbae94d16e6554b
2021-12-07 19:27:40 +00:00
Yifan Hong
28f5881247
Merge "GetBatteryInfo() also reads AIDL health HAL." am: d33b067f04
am: 9113d57446
am: 905def0b81
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1906334
Change-Id: Ic4bf79cb42825823f2a63c452d0d6554c218d450
2021-12-07 19:07:44 +00:00
Yifan Hong
905def0b81
Merge "GetBatteryInfo() also reads AIDL health HAL." am: d33b067f04
am: 9113d57446
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1906334
Change-Id: I46ab2529c774cd5563b9568a9d6eed52e4ca7676
2021-12-07 18:52:04 +00:00
Yifan Hong
9113d57446
Merge "GetBatteryInfo() also reads AIDL health HAL." am: d33b067f04
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1906334
Change-Id: I5d7635ec6dc52f9349f7ebaed304f26fd445239f
2021-12-07 18:37:33 +00:00
Yifan Hong
d33b067f04
Merge "GetBatteryInfo() also reads AIDL health HAL."
2021-12-07 18:18:07 +00:00
Shaju Mathew
148a358589
Merge "Suppression of socket connect from minadbd (CL 2/2)"
2021-12-07 04:40:40 +00:00