tequilaOS/platform_bootable_recovery
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
11709 commits 1 branch 0 tags 82 MiB
Commit graph

11709 commits

This branch
This branch
All branches
Author SHA1 Message Date
Treehugger Robot
d8c8c1b619 Merge "Migrate Test Targets to New Android Ownership Model" into main am: cd6618b619 am: 67666b2b47 
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2946233

Change-Id: Ia3c73c8e83b35bdae5cca8a592aa251e7569b821
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-04-22 18:03:39 +00:00
Treehugger Robot
67666b2b47 Merge "Migrate Test Targets to New Android Ownership Model" into main am: cd6618b619 
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2946233

Change-Id: Id1a8da7d5e0fc6d29c39f822f45c95ba25e43fb3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-04-22 17:43:32 +00:00
Treehugger Robot
cd6618b619 Merge "Migrate Test Targets to New Android Ownership Model" into main 2024-04-22 17:01:48 +00:00
Kelvin Zhang
74d9e718ff Merge "rm -rf non-AB code" into main 2024-04-11 20:36:04 +00:00
Roy Luo
95d43b9f77 Merge "recovery: do not update bootloader message for boot-fastboot" into main am: 3bf54b57d2 am: 3e55030b34 
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/3027544

Change-Id: I94d645bab06dc87562db6fe9a368564479db1214
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-04-08 19:01:29 +00:00
Roy Luo
3e55030b34 Merge "recovery: do not update bootloader message for boot-fastboot" into main am: 3bf54b57d2 
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/3027544

Change-Id: Idfc15f3c2e1dc5b398f9056c644564ad8fcc20bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-04-08 18:39:16 +00:00
Roy Luo
3bf54b57d2 Merge "recovery: do not update bootloader message for boot-fastboot" into main 2024-04-08 18:15:09 +00:00
Treehugger Robot
63e3128023 Merge "Fix sticky rescue party boot" into main am: 17833ea655 am: 0b4928ea8f 
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/3027135

Change-Id: Ibaf818acf0cf68ed8a9d5ed385c93e704d74b3da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-04-05 19:36:03 +00:00
Treehugger Robot
9ed3eed0e7 Merge "Check for build-tags before installing sideload OTA" into main am: e288aff6fa am: 10c691b0bf 
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/3006662

Change-Id: I5d6953d58797973eb764cdf35f82296eab35df19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-04-05 19:35:51 +00:00
Treehugger Robot
0b4928ea8f Merge "Fix sticky rescue party boot" into main am: 17833ea655 
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/3027135

Change-Id: I8b93c6a8a9c5c1d425cbcdc47e49779488b3b7f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-04-05 19:17:31 +00:00
Treehugger Robot
10c691b0bf Merge "Check for build-tags before installing sideload OTA" into main am: e288aff6fa 
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/3006662

Change-Id: I535697b3d14ae25f14979f804b7dcd566cfaebcd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-04-05 19:17:17 +00:00
Treehugger Robot
17833ea655 Merge "Fix sticky rescue party boot" into main 2024-04-05 18:58:54 +00:00
Treehugger Robot
e288aff6fa Merge "Check for build-tags before installing sideload OTA" into main 2024-04-05 18:52:15 +00:00
Roy Luo
cdcdf52e7c recovery: do not update bootloader message for boot-fastboot 
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-05 18:11:24 +00:00
Kelvin Zhang
c7ebad5fd6 rm -rf non-AB code 
Bug: 324360816
Test: th
Change-Id: I3d82d9031446be355d8a1d077ab83283c7cc769c
 2024-04-05 09:49:38 -07:00
Kelvin Zhang
c031e9d3d1 Fix sticky rescue party boot 
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-04-05 09:28:58 -07:00
Kelvin Zhang
e366fe9f01 Check for build-tags before installing sideload OTA 
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-26 15:55:08 -07:00
Elliott Hughes
bd27912393 Merge "Fix connect() retry loop." into main am: 5aee6aca72 am: bfb41dec7b 
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/3002967

Change-Id: I7f69809b6f7f0741f5ad73dfd990cc379b5cb416
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-03-19 15:27:29 +00:00
Elliott Hughes
bfb41dec7b Merge "Fix connect() retry loop." into main am: 5aee6aca72 
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/3002967

Change-Id: I1bbca08324cf25d1c1d8891024136bedc4892d69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-03-19 15:11:59 +00:00
Elliott Hughes
5aee6aca72 Merge "Fix connect() retry loop." into main 2024-03-19 14:49:06 +00:00
Elliott Hughes
6929e4e5dc Fix connect() retry loop. 
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-19 01:42:58 +00:00
Treehugger Robot
acd143dcf9 Merge "recovery: Update logo after going back to recovery" into main am: b70699b8e4 am: 901497d45b 
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2997656

Change-Id: I6ecee88e6db60594afebf8797fef19237f92af56
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-03-12 23:05:03 +00:00
Treehugger Robot
901497d45b Merge "recovery: Update logo after going back to recovery" into main am: b70699b8e4 
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2997656

Change-Id: I7316cba86b43fdfacbd6d710aa398459d6cf5e9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-03-12 22:21:46 +00:00
Treehugger Robot
b70699b8e4 Merge "recovery: Update logo after going back to recovery" into main 2024-03-12 21:42:32 +00:00
LuK1337
3db4f60b07
recovery: Update logo after going back to recovery 
Test: Enter fastboot, then enter recovery
Change-Id: Iee894e584451673bdaee6b2e01afaff2c3eb391f
 2024-03-11 16:25:56 +01:00
Xin Li
0860e5e0c9 [automerger skipped] Merge "Merge Android 14 QPR2 to AOSP main" into main am: 39418118fc -s ours am: f23d8a3661 -s ours 
am skip reason: Merged-In Ibe3499c903c861fddba60acddda2ff563654a2ba with SHA-1 b630ec9be6 is already in history

Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2989113

Change-Id: I2de19c57efbc138e9ae1821d155b1e7b60e3b249
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-03-07 10:49:11 +00:00
Xin Li
3cc2d00d95 [automerger skipped] Merge Android 14 QPR2 to AOSP main am: 24c76821bf -s ours am: e58ee7c8bd -s ours 
am skip reason: Merged-In Ibe3499c903c861fddba60acddda2ff563654a2ba with SHA-1 b630ec9be6 is already in history

Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2989113

Change-Id: I98ab5d01fbaea3f828b727c742531a13d764a380
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-03-07 10:46:19 +00:00
Xin Li
f23d8a3661 [automerger skipped] Merge "Merge Android 14 QPR2 to AOSP main" into main am: 39418118fc -s ours 
am skip reason: Merged-In Ibe3499c903c861fddba60acddda2ff563654a2ba with SHA-1 b630ec9be6 is already in history

Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2989113

Change-Id: Ida517f271e58a0aab57efb106d4fbe3635920451
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-03-07 09:57:54 +00:00
Xin Li
e58ee7c8bd [automerger skipped] Merge Android 14 QPR2 to AOSP main am: 24c76821bf -s ours 
am skip reason: Merged-In Ibe3499c903c861fddba60acddda2ff563654a2ba with SHA-1 b630ec9be6 is already in history

Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2989113

Change-Id: Ia60194114e4e9c3ca8d20b998654954d4257b231
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-03-07 09:54:54 +00:00
Xin Li
39418118fc Merge "Merge Android 14 QPR2 to AOSP main" into main 2024-03-07 06:41:06 +00:00
Xin Li
24c76821bf Merge Android 14 QPR2 to AOSP main 
Bug: 319669529
Merged-In: Ibe3499c903c861fddba60acddda2ff563654a2ba
Change-Id: I798ac42bd0fb3d14281c643d01ead239c8a269c1
 2024-03-06 09:29:45 -08:00
Steven Moreland
63c87a21b2 Merge "misctrl: use libbase combined logging" into main am: 564ad17564 am: b630ec9be6 
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2969975

Change-Id: I67ad2c6d6cbe993334c0dc5bf8803fcae1c3e752
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-02-22 22:29:58 +00:00
Steven Moreland
b630ec9be6 Merge "misctrl: use libbase combined logging" into main am: 564ad17564 
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-22 21:49:23 +00:00
Steven Moreland
564ad17564 Merge "misctrl: use libbase combined logging" into main 2024-02-22 21:10:04 +00:00
Steven Moreland
f19ae44727 Merge changes from topic "misctrl" into main am: 3ed266f5ed am: 50652f1f94 
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2966071

Change-Id: Ieb0db59e6b13bf799f172e0304ebbdfd351a2f73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-02-22 20:19:32 +00:00
Steven Moreland
cb1a001a32 intro misctrl am: 1dba6a8129 am: 8f3eb1eb69 
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2966070

Change-Id: I9b89885a0deba39f5ec829beb82b0185b9e9c244
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-02-22 20:19:27 +00:00
Steven Moreland
50652f1f94 Merge changes from topic "misctrl" into main am: 3ed266f5ed 
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-22 19:16:52 +00:00
Steven Moreland
8f3eb1eb69 intro misctrl am: 1dba6a8129 
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-22 19:16:46 +00:00
Steven Moreland
3ed266f5ed Merge changes from topic "misctrl" into main 
* changes:
  misctrl: read message, incl 16kb flag
  intro misctrl
 2024-02-22 18:57:01 +00:00
Steven Moreland
f8396f1bf1 misctrl: use libbase combined logging 
Now that it's added.

Bug: 317262681
Test: boot, check bugreport
Change-Id: I9b443df5f597849bf5f13792285860f549b07cfb
 2024-02-21 22:44:48 +00:00
Steven Moreland
5a4a41ee2e misctrl: read message, incl 16kb flag 
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-21 22:43:52 +00:00
Steven Moreland
1dba6a8129 intro misctrl 
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-16 22:35:22 +00:00
Alice Ryhl
e6ea567cdd Merge "Add kcmdline bootloader message" into main am: 55a44a299b am: 75ee541431 
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2908557

Change-Id: I21f7d3fa7ae35821ef3e3ee0c09f933513509bde
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-02-06 09:11:27 +00:00
Alice Ryhl
75ee541431 Merge "Add kcmdline bootloader message" into main am: 55a44a299b 
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-06 08:29:08 +00:00
Alice Ryhl
55a44a299b Merge "Add kcmdline bootloader message" into main 2024-02-06 07:52:10 +00:00
Aditya Choudhary
eb84a17080 Migrate Test Targets to New Android Ownership Model 
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-02-02 13:56:16 +00:00
Xin Li
3440d175ba [automerger skipped] Merge Android 24Q1 Release (ab/11220357) am: 056c681b51 -s ours 
am skip reason: Merged-In I8aad2264735f3204f851c981f81f712336a5bbca with SHA-1 cc953e3224 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/25972591

Change-Id: I9aa03556eabd5a076c30c26fa5e7b7bc92647efa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-01-31 02:02:32 +00:00
Xin Li
056c681b51 Merge Android 24Q1 Release (ab/11220357) 
Bug: 319669529
Merged-In: I8aad2264735f3204f851c981f81f712336a5bbca
Change-Id: I56633f84da79ee6e0a49e157b7986b83695c78f5
 2024-01-17 22:12:11 -08:00
Treehugger Robot
24d8f0c0d6 Merge "Reland "Only format /data in recovery if user specified a new fstype"" into main am: 5db49a357d am: fdcc28ebf5 am: 199b710686 
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2909199

Change-Id: Ia61ffda10aeb0ad64742c58420d0c8ae8c02d989
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-01-14 00:24:55 +00:00
Treehugger Robot
199b710686 Merge "Reland "Only format /data in recovery if user specified a new fstype"" into main am: 5db49a357d am: fdcc28ebf5 
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2909199

Change-Id: I09617b1abebc27879dba75dcf528fd89863eabe9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-01-13 23:42:52 +00:00