aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'lineage-20.0' of ↵HEADt13.0Julian Veit2024-06-1313-2/+259
|\ | | | | | | | | | | https://github.com/LineageOS/android_bootable_recovery into HEAD Change-Id: Ic0aae25ab32e81f4ebf802693f8c9a2fdc283beb
| * recovery_ui: Respect margin_height while drawing battery capacity statusChippa-a2024-03-301-1/+1
| | | | | | | | | | | | | | Some devices can use a custom margin height for recovery. Consider this to draw battery capacity status correctly. Change-Id: Ib66e88a61db17d6b4735f7f706e718de26df83d8
| * fixup! recovery_ui: Add support for battery capacity statusAaron Kling2024-02-041-1/+0
| | | | | | | | | | | | | | Don't logspam about a fake battery report. Many devices such as set top boxes and devkits intentionally don't have batteries. Change-Id: Idb22883f5d517e1e3e72512b8997709b42f1f8a4
| * recovery: Add device codename to recovery screenGreg Ross2024-01-301-0/+1
| | | | | | | | | | | | | | Add the device codename ot the title lines in the recovery screen the same way that fastbootd's title lines do. Change-Id: Ieb914d65119ab66beabd1d486a85f49901bb3f3d
| * recovery_ui: Add support for battery capacity statusChippa-a2023-12-143-0/+136
| | | | | | | | | | | | | | | | | | | | | | | | This is a reworked version from the older GUI implementation (I89c963e75bbc40f4bb7204211773fbfb28a5206b). - Update for the current recovery/fastbootd UI - Use loop to update battery capacity in background - Reflect charging status by appending "+" Change-Id: If7a6c080da273dfedddffcbea5e0ce12e677bf2f Signed-off-by: Chippa-a <bagirovvusal99@gmail.com>
| * recovery: Bypass reboot prompt for sideload-auto-rebootJoseph Annareddy2023-08-164-1/+13
| | | | | | | | | | | | | | When we want to automatically reboot after a sideload, it doesn't make much sense to try and prompt the user for a reboot into recovery. Change-Id: Id0195965362b62bf940caba1f83ffe12191a73c6
| * recovery: Simplify reboot recovery reasonLuK13372023-08-041-1/+1
| | | | | | | | | | | | | | It seems like "userrequested,recovery,ui" doesn't work properly on some devices. Change-Id: I75cba959d5f3d9d692f279e0f11e96b292c26e94
| * recovery: Clear BCB before rebooting to recoveryLuK13372023-08-041-2/+10
| | | | | | | | | | | | This should clear update_in_progress flag. Change-Id: Idc5b99a77d6f1368fa37cf664a1fb5b6b19886db
| * recovery: Ask to reboot before installing anything after A/B updateLuK13372023-07-292-0/+19
| | | | | | | | Change-Id: Id3e44ddbe11119fcc66d379216f8f5e683979a9f
| * recovery: Add support for touch rotationLuK13372023-06-253-1/+52
| | | | | | | | Change-Id: Ic72d8f902f8faeca7fc122e7ecb468e54fb8d2a4
| * Merge tag 'android-13.0.0_r52' into ↵Michael Bestas2023-06-134-1/+32
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | staging/lineage-20.0_merge-android-13.0.0_r52 Android 13.0.0 Release 52 (TQ3A.230605.012) # -----BEGIN PGP SIGNATURE----- # # iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZIi36QAKCRDorT+BmrEO # eFaGAJ4jQAKg0wE3cdkuLBmWGnu5GqJq4ACfQosSIpns3pnreHKj3ovIrLeCDvE= # =6BVx # -----END PGP SIGNATURE----- # gpg: Signature made Tue Jun 13 21:39:37 2023 EEST # gpg: using DSA key 4340D13570EF945E83810964E8AD3F819AB10E78 # gpg: Good signature from "The Android Open Source Project <initial-contribution@android.com>" [marginal] # gpg: initial-contribution@android.com: Verified 1686 signatures in the past # 19 months. Encrypted 4 messages in the past 17 months. # gpg: WARNING: This key is not certified with sufficiently trusted signatures! # gpg: It is not certain that the signature belongs to the owner. # Primary key fingerprint: 4340 D135 70EF 945E 8381 0964 E8AD 3F81 9AB1 0E78 # By Akilesh Kailash (1) and Bill Yi (1) # Via Android Build Coastguard Worker (3) and others * tag 'android-13.0.0_r52': Import translations. DO NOT MERGE ANYWHERE update_verifier: Verify blocks Change-Id: Id8b75db5fff8314a07fd4b22fc7e122742d6b418
| | * Snap for 9870854 from 36956e3bb8244bdaf9beb54ec8ac9d9a99257bba to ↵Android Build Coastguard Worker2023-04-021-1/+1
| | |\ | | | | | | | | | | | | | | | | | | | | tm-qpr3-release Change-Id: I3c6cda987154d615629f974c4e8b38a4b389f5f6
| | | * Import translations. DO NOT MERGE ANYWHEREBill Yi2023-03-311-1/+1
| | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Change-Id: I14709252f2cd771891cfacbbba7ce4372c78efa9
| | * | Snap for 9474727 from 9fd1bd240e094a0f45f998a58039bca9c6578836 to ↵Android Build Coastguard Worker2023-01-113-0/+31
| | |\| | | | | | | | | | | | | | | | | | | | | tm-qpr3-release Change-Id: I6473e63edd983f50a854c758a7e84c1ae60cfefc
| | | * Merge "update_verifier: Verify blocks" into tm-qpr-devKalesh Singh2023-01-103-0/+31
| | | |\
| | | | * update_verifier: Verify blocksAkilesh Kailash2023-01-093-0/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check if the block verification was already done by snapuserd daemon - If so, skip the verification process. If daemon failed to verify the block, update_verifier will fallback and continue the verification. Bug: 193863442 Bug: 261913544 Test: OTA Signed-off-by: Akilesh Kailash <akailash@google.com> Merged-In: I18946fb730376f19cce0738bd6765d5f5d0248b6 Change-Id: I18946fb730376f19cce0738bd6765d5f5d0248b6
| | * | | Snap for 9470583 from 1788ccc385fbc51b7894faec980b748ffe5f0d12 to ↵Android Build Coastguard Worker2023-01-1017-7/+96
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | tm-qpr3-release Change-Id: I2a2bb4420d136ddd333de67d9aa4bdc749257b6c
| * | | | recovery: Allow custom bootloader msg offset in block miscAlessandro Astone2023-04-082-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Squash of changes * Allow custom bootloader msg offset in block misc Change-Id: I6f3de1c2e3745c5535c3b95399abb8b2e2d01446 * recovery: Move bldrmsg offset symbols to bootloader_message.cpp Change-Id: I2b902bcce7f5ca13472e0ac30ac01b4991294dbe Adapted for Android.bp version of libbootloader_message * For android-11, these definitions are now used outside of the library itself, so keep them in the header, and export the necessary c flag to dependant modules Change-Id: I5768660569d56b0d7c358f562e79483fd5f6db53
| * | | | recovery: wipe bootloader message from index 0 when using custom offsetsAlessandro Astone2023-04-081-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * We may use a custom offset to: a) preserve data that oem wrote to the first bytes of misc b) skip recovery flags written by the bootloader (e.g. --wipe_data) For case a) one should set the offset 'x' to be at least greater than the size of bootloader_message struct (2048 bytes). If this is the case, then we zero out bytes x ~ x + 2047 For case b) one should set the offset to be strictly smaller than the size of bootloader_message struct. If this is the case, then we zero out bytes 0 ~ 2047. This allows to clear any additional flag set by the bootloader, that would otherwise be forgotten in misc. This also guarantees that we do not involountarily wipe any data that the oem may have written starting at byte 2048 (coff coff LG) Change-Id: I2d4e0702a2d8cbbef6274a87ce9499b0f69310dd
| * | | | Merge tag 'android-13.0.0_r35' into ↵Michael Bestas2023-03-142-2/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | staging/lineage-20.0_merge-android-13.0.0_r35 Android 13.0.0 release 35 # -----BEGIN PGP SIGNATURE----- # # iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZA9jpwAKCRDorT+BmrEO # eH7xAJ41bDgK+valbjRLMoDmdOJTZkkwaACePKRd7VxM5jsabKewwwR+z7P9yUU= # =rYWQ # -----END PGP SIGNATURE----- # gpg: Signature made Mon Mar 13 19:55:51 2023 EET # gpg: using DSA key 4340D13570EF945E83810964E8AD3F819AB10E78 # gpg: Good signature from "The Android Open Source Project <initial-contribution@android.com>" [marginal] # gpg: initial-contribution@android.com: Verified 1575 signatures in the past # 16 months. Encrypted 4 messages in the past 14 months. # gpg: WARNING: This key is not certified with sufficiently trusted signatures! # gpg: It is not certain that the signature belongs to the owner. # Primary key fingerprint: 4340 D135 70EF 945E 8381 0964 E8AD 3F81 9AB1 0E78 # By Bill Yi # Via Android Build Coastguard Worker (5) and Bill Yi (1) * tag 'android-13.0.0_r35': Import translations. DO NOT MERGE ANYWHERE Import translations. DO NOT MERGE ANYWHERE Import translations. DO NOT MERGE ANYWHERE Import translations. DO NOT MERGE ANYWHERE Change-Id: Ifac475a0b581baccee1fd44009f5541db86a37d0
* | | | | | recovery: Allow custom bootloader msg offset in block miscAlessandro Astone2023-04-112-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Squash of changes * Allow custom bootloader msg offset in block misc Change-Id: I6f3de1c2e3745c5535c3b95399abb8b2e2d01446 * recovery: Move bldrmsg offset symbols to bootloader_message.cpp Change-Id: I2b902bcce7f5ca13472e0ac30ac01b4991294dbe Adapted for Android.bp version of libbootloader_message * For android-11, these definitions are now used outside of the library itself, so keep them in the header, and export the necessary c flag to dependant modules Change-Id: I5768660569d56b0d7c358f562e79483fd5f6db53
* | | | | | recovery: wipe bootloader message from index 0 when using custom offsetsAlessandro Astone2023-04-111-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * We may use a custom offset to: a) preserve data that oem wrote to the first bytes of misc b) skip recovery flags written by the bootloader (e.g. --wipe_data) For case a) one should set the offset 'x' to be at least greater than the size of bootloader_message struct (2048 bytes). If this is the case, then we zero out bytes x ~ x + 2047 For case b) one should set the offset to be strictly smaller than the size of bootloader_message struct. If this is the case, then we zero out bytes 0 ~ 2047. This allows to clear any additional flag set by the bootloader, that would otherwise be forgotten in misc. This also guarantees that we do not involountarily wipe any data that the oem may have written starting at byte 2048 (coff coff LG) Change-Id: I2d4e0702a2d8cbbef6274a87ce9499b0f69310dd
* | | | | | Merge tag 'android-13.0.0_r35' into t13.0Semavi Ulusoy2023-03-262-2/+2
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | Android 13.0.0 release 35 Change-Id: Iedf541ebcd02094b4d3f49a161b99456bc7a5a28
| * | | | | Snap for 9447015 from 1788ccc385fbc51b7894faec980b748ffe5f0d12 to ↵Android Build Coastguard Worker2023-01-011-10/+10
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | tm-qpr2-release Change-Id: I3b4c047e5e08b1522b4b2356e99c9cf23078a825
| | * | | | Import translations. DO NOT MERGE ANYWHEREBill Yi2022-12-291-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Change-Id: I9ca1643c37cf1ccdfecff4bfd0f405718be75669
| * | | | | Snap for 9424627 from b904bdb4458f2d274f128cfa81de21a07329133e to ↵Android Build Coastguard Worker2022-12-211-10/+10
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tm-qpr2-release Change-Id: I9c3bb53f6682d09fe1c64509bfe684a6caf40a6b
| | * | | | Import translations. DO NOT MERGE ANYWHEREBill Yi2022-12-191-10/+10
| | | |_|/ | | |/| | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Change-Id: I966dc384c93bb8ff1fc53620f8f69fce32f81000
| * | | | Snap for 9301146 from 80267eba5d9ef2f991cfe96c726969a9499e3649 to ↵Android Build Coastguard Worker2022-11-171-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | tm-qpr2-release Change-Id: I1bf3ea24dffd29eac829cbcf1ef7c4bb9b125a1f
| | * | | Import translations. DO NOT MERGE ANYWHEREBill Yi2022-11-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Change-Id: I242fd8d1a2309f4b64c88df8d4eac840ccb0eca2
| * | | | Snap for 9190355 from d1e5cf0eaefa3093415ebffe3edfb2a0b85bd3b6 to ↵Android Build Coastguard Worker2022-10-181-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | tm-qpr2-release Change-Id: I66c4d7c10eb627f2f35c6e62cbec717b6677fd58
| | * | | Import translations. DO NOT MERGE ANYWHEREBill Yi2022-10-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Change-Id: I49504e35c1adce5761e22c46c858fca0eada73cf
| * | | | Snap for 9133013 from 8cea2956a5b6d403753f7658d2c2643a81d06cdd to ↵Android Build Coastguard Worker2022-10-0315-5/+94
| |\| | | | | |_|/ | |/| | | | | | | | | | | | | | tm-qpr2-release Change-Id: I8aab8e70d415eb5dc8047550df45a5add3c9e0ce
* | | | recovery: Drop useless version dateDarkJoker3602023-01-171-6/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Not needed as we are now showing up full versioning. Signed-off-by: DarkJoker360 <simoespo159@gmail.com> Signed-off-by: Pranav Vashi <neobuddy89@gmail.com> Change-Id: I889d56535201ff91943c7f57bf8f3ad1585cdae4
* | | | recovery: AICPify VersionJulian Veit2023-01-171-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: I1a33e41d4d34096d2de2f1cf756eb41dee79bd73 Signed-off-by: Semavi Ulusoy <doc.divxm@gmail.com>
* | | | recovery: rewrite slot switch logic using bootcontrol APIsAnay Wadhera2023-01-172-19/+16
| | | | | | | | | | | | | | | | | | | | Change-Id: I1eb136c81cc9246b0c9f5e52bcf6e7ba40fbc12d Signed-off-by: jhonboy121 <alfredmathew05@gmail.com>
* | | | recovery: add support for changing slotsEthan Yonker2023-01-175-0/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * reference: https://github.com/omnirom/android_bootable_recovery/commit/1b190166eb1295c6339f6100e4fbb92c81b81ea6 Change-Id: I848e003ca569dfaa572ce7641775f0ea9f2b5513 Signed-off-by: jhonboy121 <alfredmathew05@gmail.com>
* | | | updater: Don't fail when trying to run set_metadatajhenrique092023-01-171-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * That's ok if file not exists Change-Id: I8fa43e8520e75916907d528f772eb4f624c1ae19 Signed-off-by: Pranav Vashi <neobuddy89@gmail.com>
* | | | recovery: Only warn on SPL downgradePranav Vashi2023-01-171-2/+1
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | * This will not completely block SPL downgrade but instead ask user whether to allow downgrade. * This is useful when switching between custom and stock ROMs when there is no option to format system partitions. Signed-off-by: Pranav Vashi <neobuddy89@gmail.com> Change-Id: I52be7dd950dee72c9fe01e404f74c41f2d25c8b7
* | | Remove error messages from LoadLocalizedBitmapMichael Bestas2022-12-201-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Id38d239254f17eeed5491621865c747a8496ed83 we removed the locale images since they conflict with our UI changes. However this ended up causing at least 10 warnings in recovery logs every time recovery runs. Get rid of the warnings since this function is always supposed to fail for us. Change-Id: I9ad6b320739f38bc3bb7a749c50eb17c8feafece
* | | recovery: fix applying updatesAlexander Martinz2022-12-201-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to break after applying from either ADB or Storage to return the status of the installation. Otherwise the log is stuck until you press on the back arrow, you are able to start sideload multiple times and other shenanigans. Change-Id: I06c9dcf6161dd1a0199417cfed2465914837d795 Signed-off-by: Alexander Martinz <amartinz@shiftphones.com>
* | | Merge tag 'android-13.0.0_r16' into ↵Michael Bestas2022-12-0615-5/+94
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | staging/lineage-20.0_merge-android-13.0.0_r16 Android 13.0.0 Release 16 (TQ1A.221205.011) # -----BEGIN PGP SIGNATURE----- # # iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCY45r9QAKCRDorT+BmrEO # eIu9AJ9LTDvELjvd/VCi/3krLTeKYx3R8wCbB+NiqpsnVsKKuZ/40XkPXtm19FU= # =YZIx # -----END PGP SIGNATURE----- # gpg: Signature made Tue Dec 6 00:08:53 2022 EET # gpg: using DSA key 4340D13570EF945E83810964E8AD3F819AB10E78 # gpg: Good signature from "The Android Open Source Project <initial-contribution@android.com>" [marginal] # gpg: initial-contribution@android.com: Verified 1389 signatures in the past # 13 months. Encrypted 4 messages in the past 10 months. # gpg: WARNING: This key is not certified with sufficiently trusted signatures! # gpg: It is not certain that the signature belongs to the owner. # Primary key fingerprint: 4340 D135 70EF 945E 8381 0964 E8AD 3F81 9AB1 0E78 # By Bill Yi (11) and others # Via Automerger Merge Worker (44) and others * tag 'android-13.0.0_r16': Fix misconfigured recovery host test Import translations. DO NOT MERGE ANYWHERE Import translations. DO NOT MERGE ANYWHERE Import translations. DO NOT MERGE ANYWHERE recovery_ui:Add support for multiple connectors switch minui: Add API to support multiple connectors detection Import translations. DO NOT MERGE ANYWHERE Import translations. DO NOT MERGE ANYWHERE Import translations. DO NOT MERGE ANYWHERE Fix misconfigured recovery host test Fix misconfigured recovery host test Fix misconfigured recovery host test Import translations. DO NOT MERGE ANYWHERE Import translations. DO NOT MERGE ANYWHERE Import translations. DO NOT MERGE ANYWHERE Import translations. DO NOT MERGE ANYWHERE Import translations. DO NOT MERGE ANYWHERE Conflicts: recovery_ui/include/recovery_ui/screen_ui.h Change-Id: I8372bb359dade75a38425096fac4f2ce7220dc35
| * \ \ Snap for 9048375 from 8cea2956a5b6d403753f7658d2c2643a81d06cdd to ↵Android Build Coastguard Worker2022-09-100-0/+0
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | tm-qpr1-release Change-Id: Icb794a0f8da64fbdaf4eef06aa01ee807e6362d0
| | * | [automerger skipped] [automerge] Fix misconfigured recovery host test 2p: ↵Kelvin Zhang2022-09-080-0/+0
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d3cd440d2d am: f3419014dc am: 8ce6c88860 -s ours am: 031df89b1d -s ours am: 8474ab13e1 -s ours am skip reason: Merged-In I13bb9595745f65a63070cf9fe030c9155f75e4d0 with SHA-1 d3cd440d2d is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/19900295 Change-Id: I1ccb7072d77bee389f9953f940ca93ce323331c4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | | * \ [automerger skipped] [automerge] Fix misconfigured recovery host test 2p: ↵Kelvin Zhang2022-09-080-0/+0
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d3cd440d2d am: f3419014dc am: 8ce6c88860 -s ours am: 031df89b1d -s ours am skip reason: Merged-In I13bb9595745f65a63070cf9fe030c9155f75e4d0 with SHA-1 d3cd440d2d is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/19900295 Change-Id: I9efa56e42eb2fc60f545d5630ea9859fa45dda6a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | | | * \ [automerger skipped] [automerge] Fix misconfigured recovery host test 2p: ↵Kelvin Zhang2022-09-080-0/+0
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d3cd440d2d am: f3419014dc am: 8ce6c88860 -s ours am skip reason: Merged-In I13bb9595745f65a63070cf9fe030c9155f75e4d0 with SHA-1 d3cd440d2d is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/19900295 Change-Id: Id7629f94c35b2ef895c6411e5df82f1a98f12013 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | | | | * \ [automerge] Fix misconfigured recovery host test 2p: d3cd440d2d am: f3419014dcKelvin Zhang2022-09-082-0/+1
| | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/19900295 Change-Id: Ib00fc5cd62b651c0ddd59c4b528b57f01c433ab1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | | | | | * \ [automerge] Fix misconfigured recovery host test 2p: d3cd440d2dKelvin Zhang2022-09-082-0/+1
| | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/19900295 Bug: 241353143 Change-Id: I6404a00aa135d0af5e8bca738d4d2c1fa37619d8 Merged-In: I13bb9595745f65a63070cf9fe030c9155f75e4d0
| * | | | | | | | Snap for 9043175 from f67cac423c801b743e7baa878d7f008b89a2d7ad to ↵Android Build Coastguard Worker2022-09-080-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tm-qpr1-release Change-Id: If04d6db0a76e6eb90fc183d7db6847030b2aa1c1
| | * | | | | | | [automerger skipped] [automerged blank] Fix misconfigured recovery host test ↵Kelvin Zhang2022-09-080-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2p: d3cd440d2d 2p: affcbd2d7c am: 39063160c6 -s ours am: 2649c470a8 -s ours am skip reason: Merged-In I13bb9595745f65a63070cf9fe030c9155f75e4d0 with SHA-1 39c684a71c is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/19900295 Change-Id: Ib319c4764f383f7a751ddddbdb4418a7bc90249d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | | * | | | | | [automerger skipped] [automerged blank] Fix misconfigured recovery host test ↵Kelvin Zhang2022-09-080-0/+0
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2p: d3cd440d2d 2p: affcbd2d7c am: 39063160c6 -s ours am skip reason: Merged-In I13bb9595745f65a63070cf9fe030c9155f75e4d0 with SHA-1 39c684a71c is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/19900295 Change-Id: I8c180ee4de5f000cf55506f7e32d6b5c71c8908d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-19 22:18:57 +0000