aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2024-05-17Merge "Update OWNERS for minadbd." into mainHEADmastermainTreehugger Robot
2024-05-17Update OWNERS for minadbd.Elliott Hughes
This code sometimes needs to track adbd changes. Change-Id: Icbda00309698b210d1d79b88322f1c6e9483f11d
2024-05-14Merge "Revert "Remove non-AB unittests"" into mainKelvin Zhang
2024-05-14Revert "Remove non-AB unittests"Kelvin Zhang
This reverts commit f203ee526f4db6f5875d36c06382f98c4ffcabb5. Reason for revert: b/340571274 Merged-In: I3d82d9031446be355d8a1d077ab83283c7cc769c Change-Id: I36d6246a32a83545b1d1b708372e8d3d72b4a041
2024-05-14Merge "Remove non-AB unittests" into mainTreehugger Robot
2024-05-13Remove non-AB unittestsKelvin Zhang
non-AB is deprecated, remove unittets first. This CL also puts non-AB libraries in a separate soong namepsace, which allows two copies of non-AB code to co-exist temporarily during migration. Test: th Bug: 324360816 Merged-In: I3d82d9031446be355d8a1d077ab83283c7cc769c Change-Id: Idd9386f4c8d32508734b1bfe9b9f76668aa710bc
2024-04-30Merge "Pause recovery when it ends with Shutdown" into mainTreehugger Robot
2024-04-26Pause recovery when it ends with Shutdownguangkui.ren
In the current design, when recovery ends with Shutdown, it will continue to execute commands repeatedly in the loop body, after it sets a "Shutdown" property. That may lead to some competition between the shutdown process and recovery command work, and then cause some problems. So, pause recovery when it ends with Shutdown, like it ending with Reboot. Change-Id: I57dfef70e7b8d600af3a3f2c0199f14d5a0e9916
2024-04-22Merge "Migrate Test Targets to New Android Ownership Model" into mainTreehugger Robot
2024-04-08Merge "recovery: do not update bootloader message for boot-fastboot" into mainRoy Luo
2024-04-05Merge "Fix sticky rescue party boot" into mainTreehugger Robot
2024-04-05Merge "Check for build-tags before installing sideload OTA" into mainTreehugger Robot
2024-04-05recovery: do not update bootloader message for boot-fastbootRoy Luo
When booting to fastbootd using bootloader message: boot.command=boot-fastboot, the boot command get overwritten to boot-recovery by update_bootloader_message. If the daemon crash for whatever reason before the bootloader message got clear, the daemon would start in adb recovery mode instead of fastbootd after it respawns. Only update bootloader message for boot-recovery command. Bug: 332973437 Test: boot to fastbootd Change-Id: I5747c62cf50d2347894d266f2665035f15ae5da0
2024-04-05Fix sticky rescue party bootKelvin Zhang
When entering recovery via rescue party, recovery does not call FinishRecovery() to reset BCB. This causes the rescue party command to stick, and device keeps rebooting into rescue party mode after entering bootloader mode and reboot. Test: enter rescue party, reboot bootloader, fastboot reboot Bug: 332621855 Change-Id: I958a77ccb2433d76aecb44f8c6f8fedebe08bbe0
2024-03-26Check for build-tags before installing sideload OTAKelvin Zhang
Only allow test-key OTA to be installed on test-key devices, and only allow release-key OTA to be installed on release-key devices. Test: sideload recovery OTA Bug: 314013134 Change-Id: I6609923929247ab498d3a315637765ae2d1370b0
2024-03-19Merge "Fix connect() retry loop." into mainElliott Hughes
2024-03-19Fix connect() retry loop.Elliott Hughes
This would succeed eventually anyway: the first time round the connect() succeeds, returns 0, and we go around the loop again; the second time the connect() fails (because we're already connected), returns -1, and we set success to true and exit the loop. But this means that the intended retry functionality is broken. Change-Id: If631d59e23b12e9aa952cdb528160b19b9a94b1c
2024-03-12Merge "recovery: Update logo after going back to recovery" into mainTreehugger Robot
2024-03-11recovery: Update logo after going back to recoveryLuK1337
Test: Enter fastboot, then enter recovery Change-Id: Iee894e584451673bdaee6b2e01afaff2c3eb391f
2024-03-07Merge "Merge Android 14 QPR2 to AOSP main" into mainXin Li
2024-03-06Merge Android 14 QPR2 to AOSP mainXin Li
Bug: 319669529 Merged-In: Ibe3499c903c861fddba60acddda2ff563654a2ba Change-Id: I798ac42bd0fb3d14281c643d01ead239c8a269c1
2024-02-22Merge "misctrl: use libbase combined logging" into main am: 564ad17564temp_319669529Steven Moreland
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2969975 Change-Id: Ibe3499c903c861fddba60acddda2ff563654a2ba Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-22Merge "misctrl: use libbase combined logging" into mainSteven Moreland
2024-02-22Merge changes from topic "misctrl" into main am: 3ed266f5edSteven Moreland
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2966071 Change-Id: I7bf4a81ecd62ea1dae22e03e02b8fd7ca566c121 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-22intro misctrl am: 1dba6a8129Steven Moreland
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2966070 Change-Id: I39bc4b1309e82064234a8f6d3c63e91e8e98d4ba Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-22Merge changes from topic "misctrl" into mainSteven Moreland
* changes: misctrl: read message, incl 16kb flag intro misctrl
2024-02-21misctrl: use libbase combined loggingSteven Moreland
Now that it's added. Bug: 317262681 Test: boot, check bugreport Change-Id: I9b443df5f597849bf5f13792285860f549b07cfb
2024-02-21misctrl: read message, incl 16kb flagSteven Moreland
Add a misctrl specific message with its first use. Future platform flags can go here for any purpose, without needing to add separate utilities. Check if a device has ever been in 16KB before so that we are able to tell if 16KB causes any issues. Bug: 317262681 Test: boot, bugreport Change-Id: I21299ded1520020768462950713cbe49ca3c438f
2024-02-16intro misctrlSteven Moreland
Generic binary for managing the /misc partition. This CL only uses it to do a basic health check for the /misc partition, but the idea is this is a single place that can manage misc partition operations for the Android platform, rather than having to write a new tool each time. Bug: 317262681 Test: boot, check bugreport Change-Id: I29a4189e2e9aee57cf66520207297d39d666f7a4
2024-02-06Merge "Add kcmdline bootloader message" into main am: 55a44a299bAlice Ryhl
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2908557 Change-Id: I6cd493cc6188d110406840b27d9dafebb05e3627 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-06Merge "Add kcmdline bootloader message" into mainAlice Ryhl
2024-02-02Migrate Test Targets to New Android Ownership ModelAditya Choudhary
This CL is created as a best effort to migrate test targets to the new Android ownership model. It is based on historical data from repository history and insights from git blame. Given the nature of this effort, there may be instances of incorrect attribution. If you find incorrect or unnecessary attribution in this CL, please create a new CL to fix that. For detailed guidelines and further information on the migration please refer to the link below, go/new-android-ownership-model Bug: 304529413 Test: N/A Change-Id: Ia2268756e71b22238b17b21d336f5f7e5bd35b0b
2024-01-17Merge Android 24Q1 Release (ab/11220357)Xin Li
Bug: 319669529 Merged-In: I8aad2264735f3204f851c981f81f712336a5bbca Change-Id: I56633f84da79ee6e0a49e157b7986b83695c78f5
2024-01-13Merge "Reland "Only format /data in recovery if user specified a new ↵Treehugger Robot
fstype"" into main am: 5db49a357d Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2909199 Change-Id: I1399bb7b5d57507a9fce323fc07f734f14c97bc5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-13Merge "Reland "Only format /data in recovery if user specified a new ↵Treehugger Robot
fstype"" into main
2024-01-13Reland "Only format /data in recovery if user specified a new fstype"Kelvin Zhang
This reverts commit c89b4e4314e8729871bb1e69d197da7446966ffb. Reason for revert: reland the feature with bug fixed Bug: 293313353 Test: Enter recovery with data wipe command Change-Id: I2e1cfb91966c1af0145aac43cf11629cef9380d2
2024-01-12Add kcmdline bootloader messageAlice Ryhl
Define a new struct in the misc partition for telling the bootloader to set kcmdline flags for enabling experimental dogfood features in the kernel. Test: Verified that a custom bootloader is able to read the data Bug: 278052745 Change-Id: I5f13a9bdff940517cb7b880815dfb8f396fc3844 Signed-off-by: Alice Ryhl <aliceryhl@google.com>
2024-01-11Merge "Revert "Only format /data in recovery if user specified a new ↵Treehugger Robot
fstype"" into main am: f554b33bb9 Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2905428 Change-Id: Ie0c801cf56dac9e059fbe0119d810dc2b7e5d51c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-11Merge "Revert "Only format /data in recovery if user specified a new ↵Treehugger Robot
fstype"" into main
2024-01-11Revert "Only format /data in recovery if user specified a new fstype"Dan Shi
This reverts commit 765172c709e8296e395de7a6ca368883485faa08. Reason for revert: b/319516268 Change-Id: I974722fb433f20c57b9535fef2e28a78acbc1931
2024-01-10Merge "Only format /data in recovery if user specified a new fstype" into ↵Treehugger Robot
main am: d0867b54f3 Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2903355 Change-Id: I48be515090da4b43794835cee0f7875cacfe8ff9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-10Merge "Only format /data in recovery if user specified a new fstype" into mainTreehugger Robot
2024-01-10Only format /data in recovery if user specified a new fstypeKelvin Zhang
recovery mode does not have key services, so formatting volumes in recovery would result in an unencrypted image. If init detects an unencrypted /data image, encrypt_inplace would be called. We would like to avoid using `encrypt_inplace` in production. So do not format /data in recovery for regular data wipes. Test: th Bug: 293313353 Change-Id: I401da2a876ed22b426872c80c231397c12ec0737
2024-01-08Merge "Fix the problem of incremental OTA upgrade failure (recovery part)" ↵Elliott Hughes
into main am: 64e3bde459 Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2901147 Change-Id: I9f2cb75666ce9cf76fdeed3316c9b0c72590d320 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-08Merge "Fix the problem of incremental OTA upgrade failure (recovery part)" ↵Elliott Hughes
into main
2024-01-08Fix the problem of incremental OTA upgrade failure (recovery part)luoqiangwei1
When the updater compresses the file after the apply patch, unexpected results are generated, resulting in the failure of incremental OTA upgrade Test: make imgdiff updater Change-Id: I0d7652dca46c5b027f22670b254332fb8a5d5c98 Signed-off-by: luoqiangwei1 <luoqiangwei1@xiaomi.com>
2024-01-05Merge "Add recovery flag to reformat /data" into main am: c7fad9a77cTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2898791 Change-Id: I3358ae3c27caa88d8032e0ae6bfe0985f5ddb761 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-05Merge "Add recovery flag to reformat /data" into mainTreehugger Robot
2024-01-04Add recovery flag to reformat /dataKelvin Zhang
For 16K dev options, we might need to reformat /data partition as ext4 before enabling the feature. Add necessary support to recovery. Test: Trigger reboot with --wipe_data --reformat_data=ext4, make sure /data is reformatted with ext4 on next boot Bug: 293313353 Change-Id: I3cb67a62635a2df578472cd48cf6d2f5e04b5f82
2023-12-13Merge "updater_sample: tools: import AbOtaPropertyFiles from ota_utils" into ↵Treehugger Robot
main am: c117b7e495 am: 2caa07b8f4 am: 138bb18f3b Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2837717 Change-Id: I8f19ff581dabbac7a6b2b4873ce861c22bcc0a81 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 2024-06-02 07:17:55 +0000