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

11691 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
Treehugger Robot
fdcc28ebf5 Merge "Reland "Only format /data in recovery if user specified a new 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-13 23:12:38 +00:00
Treehugger Robot
5db49a357d Merge "Reland "Only format /data in recovery if user specified a new fstype"" into main 2024-01-13 22:30:51 +00:00
Kelvin Zhang
aa0a88def3 Reland "Only format /data in recovery if user specified a new fstype" 
This reverts commit c89b4e4314.

Reason for revert: reland the feature with bug fixed

Bug: 293313353
Test: Enter recovery with data wipe command

Change-Id: I2e1cfb91966c1af0145aac43cf11629cef9380d2
 2024-01-13 13:51:57 -08:00
Alice Ryhl
a4aec2f2ce Add kcmdline bootloader message 
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-12 13:36:09 +00:00
Treehugger Robot
29488e4274 Merge "Revert "Only format /data in recovery if user specified a new fstype"" into main am: f554b33bb9 am: b1d235a119 am: 4fb369aae7 
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2905428

Change-Id: I60bc0240e6603cec519e964217e1d7b25e8420f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-01-11 06:17:26 +00:00
Treehugger Robot
4fb369aae7 Merge "Revert "Only format /data in recovery if user specified a new fstype"" into main am: f554b33bb9 am: b1d235a119 
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2905428

Change-Id: Ib1e564e7e4f9f1bac59df26f3f39ed6c5c51116c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-01-11 05:25:25 +00:00
Treehugger Robot
b1d235a119 Merge "Revert "Only format /data in recovery if user specified a new 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-11 04:40:10 +00:00
Treehugger Robot
f554b33bb9 Merge "Revert "Only format /data in recovery if user specified a new fstype"" into main 2024-01-11 04:00:54 +00:00
Dan Shi
c89b4e4314 Revert "Only format /data in recovery if user specified a new fstype" 
This reverts commit 765172c709.

Reason for revert: b/319516268

Change-Id: I974722fb433f20c57b9535fef2e28a78acbc1931
 2024-01-11 02:46:37 +00:00
Treehugger Robot
a252ebd232 Merge "Only format /data in recovery if user specified a new fstype" into main am: d0867b54f3 am: f4c94f692d am: fd103cf5a5 
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2903355

Change-Id: I844452c4378c1d2fa333141533e944fcc33e0430
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-01-11 00:37:44 +00:00
Treehugger Robot
fd103cf5a5 Merge "Only format /data in recovery if user specified a new fstype" into main am: d0867b54f3 am: f4c94f692d 
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2903355

Change-Id: I037a02782ad9574196c71e8da4e045a723123570
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-01-10 23:48:00 +00:00
Treehugger Robot
f4c94f692d Merge "Only format /data in recovery if user specified a new fstype" into 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-10 23:02:17 +00:00
Treehugger Robot
d0867b54f3 Merge "Only format /data in recovery if user specified a new fstype" into main 2024-01-10 21:45:13 +00:00
Kelvin Zhang
765172c709 Only format /data in recovery if user specified a new fstype 
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-10 10:43:04 -08:00
Elliott Hughes
04daca1e0d Merge "Fix the problem of incremental OTA upgrade failure (recovery part)" into main am: 64e3bde459 am: 81ce5cf3bf am: 036eb4a89d 
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2901147

Change-Id: I12c2c4ceefcf762f7fbe1a72f1fef2d302cf675d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-01-09 00:08:17 +00:00
Elliott Hughes
036eb4a89d Merge "Fix the problem of incremental OTA upgrade failure (recovery part)" into main am: 64e3bde459 am: 81ce5cf3bf 
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2901147

Change-Id: I73af8326b9406e4514a71f50fc1c975636a4f683
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-01-08 23:37:06 +00:00
Elliott Hughes
81ce5cf3bf Merge "Fix the problem of incremental OTA upgrade failure (recovery part)" 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-08 23:07:39 +00:00
Elliott Hughes
64e3bde459 Merge "Fix the problem of incremental OTA upgrade failure (recovery part)" into main 2024-01-08 22:22:51 +00:00