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

11780 commits

This branch
This branch
All branches
Author SHA1 Message Date
Treehugger Robot
6dee61bf56 Merge "Pause recovery when it ends with Shutdown" into main am: 75014b82e2 
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/3030423

Change-Id: I7ab1dd0f8082958ef812b26019c319770df3f02b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-04-30 17:32:09 +00:00
Treehugger Robot
75014b82e2 Merge "Pause recovery when it ends with Shutdown" into main 2024-04-30 17:07:21 +00:00
Xin Li
ae5015bb64 [automerger skipped] Empty merge of Android 24Q2 Release (ab/11526283) to aosp-main-future am: 0affc7a1ad -s ours 
am skip reason: Merged-In Id1a8da7d5e0fc6d29c39f822f45c95ba25e43fb3 with SHA-1 67666b2b47 is already in history

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

Change-Id: I1b8116ba481bf22ee7c7121bdeee6dd9bb3c436e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-04-29 23:45:57 +00:00
Xin Li
0affc7a1ad Empty merge of Android 24Q2 Release (ab/11526283) to aosp-main-future 
Bug: 337098550
Merged-In: Id1a8da7d5e0fc6d29c39f822f45c95ba25e43fb3
Change-Id: Ib04834d3a7c4c3ed706926aeff9cbf44da7f9f6e
 2024-04-29 11:46:45 -07:00
Android Build Coastguard Worker
b0e3cfbe06 Snap for 11774205 from 73b2787228 to 24Q3-release 
Change-Id: I64fdd98c485c26c8957b83e01a050ab28dbcd303
 2024-04-27 21:00:40 +00:00
Bill Yi
73b2787228 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c599d24d0f -s ours 
am skip reason: contains skip directive

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

Change-Id: I6d7903045bafc2e7e602e7e6bf2196a802d2ff50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-04-26 23:30:41 +00:00
Bill Yi
a9623e262a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 34dbc50ddf -s ours 
am skip reason: contains skip directive

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

Change-Id: I0e6748ce1922407429d90f0f48f6b9a9765a8875
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-04-26 23:01:04 +00:00
guangkui.ren
aef46f3edd Pause recovery when it ends with Shutdown 
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-26 06:08:57 +00:00
Bill Yi
c599d24d0f Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ib57f06cdb4fdf567a4c4e4ca17d4df7b1745cec7
 2024-04-25 17:07:43 -07:00
Bill Yi
34dbc50ddf Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I8c1973d53614f93ee7b0d497dabcaad4918672aa
 2024-04-25 17:06:27 -07:00
Android Build Coastguard Worker
fd68edf1e2 Snap for 11766482 from 3c14d12c87 to 24Q3-release 
Change-Id: I4037a5ca3e620d11eacd9eda8af8aac3ae04c45a
 2024-04-25 23:00:53 +00:00
Bill Yi
3c14d12c87 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I96c0632fa29b1739a8b7d98bd0b0b4cbe60f3881
 2024-04-24 09:09:53 -07:00
Android Build Coastguard Worker
c53c19dc8f Snap for 11753769 from d8c8c1b619 to 24Q3-release 
Change-Id: Iae6d8fb584a70fc8104d3d17a57c05583fbc2ac6
 2024-04-23 23:01:24 +00:00
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
Android Build Coastguard Worker
b0bc015e19 Snap for 11710546 from 74d9e718ff to 24Q3-release 
Change-Id: I29d8854352c2b65d3afce9f2b64f19b742f7b925
 2024-04-13 01:01:04 +00:00
Kelvin Zhang
74d9e718ff Merge "rm -rf non-AB code" into main 2024-04-11 20:36:04 +00:00
Android Build Coastguard Worker
29baf0bfb8 Snap for 11685790 from 95d43b9f77 to 24Q3-release 
Change-Id: Ib924bea17e0483c1cc06216bef0b4eaefad33700
 2024-04-08 23:00:50 +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
Android Build Coastguard Worker
f445350d16 Snap for 11679388 from 63e3128023 to 24Q3-release 
Change-Id: I0e2d8ca6bca8155b0b207d522ce42ab9d85e2cda
 2024-04-06 01:00:47 +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
Android Build Coastguard Worker
15fc244416 Snap for 11597038 from bd27912393 to 24Q3-release 
Change-Id: Ic66a47e62dca716ac46c5292e2a416ec7cac2f88
 2024-03-19 23:01:04 +00: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
Android Build Coastguard Worker
9c49697810 Snap for 11571437 from acd143dcf9 to 24Q3-release 
Change-Id: I84d3fd0f3276e464cc58790a725631c8d99de6fa
 2024-03-13 23:00:47 +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
Android Build Coastguard Worker
519cab2b5d Snap for 11545716 from 0860e5e0c9 to 24Q3-release 
Change-Id: I1d50ecc2d675b7ee72f96a3b78d5f523150c3055
 2024-03-08 00:00:35 +00: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