Commit graph

9974 commits

Author SHA1 Message Date
Kelvin Zhang
3d0d9c35f6 Log a copy of recovery log to kernel logs
Currently, recovery logs are only saved to /tmp/recovery.log . That's
bad, because /tmp/recovery.log would not be available after reboot. To
help debugging recovery issues, log a copy to kernel log, which will be
saved in pstore after device reboots.

Bug: 228893064
Change-Id: I0f97b402726ecabe644f3ff5182f71bd16d0b111
2022-04-20 14:53:19 -07:00
Treehugger Robot
5887c94640 Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-03-28 06:27:28 +00:00
Bill Yi
4a90a95898 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ieeffbbc34b4a5187b46bf6fe561855128a25f002
2022-03-27 03:54:06 +00:00
Shikha Malhotra
29e218afd6 Merge "Enable ProjectID by default." 2022-03-22 16:32:39 +00:00
Eric Biggers
37a4f4d243 Merge "Remove support for converting from FDE to FBE" 2022-03-17 21:59:32 +00:00
Shikha Malhotra
d21e516def Enable ProjectID by default.
This is in conjunction with enabling the project id for internal directories. The check whether project ids should be used or not, is done in installd process. If they cannot be used, then the installd process falls back to previous approaches.

Bug: b/215154615
Test: atest installd/StorageHostTest
Test: atest installd/installd_service_test.cpp
Change-Id: I9a45a14cf10c040f7ce84f78c5e9c8ce60c17958
2022-03-17 11:22:48 +00:00
Eric Biggers
fde69fbd8a Remove support for converting from FDE to FBE
Devices that launched with Android 10 or later require FBE (File Based
Encryption) from the beginning, so there's no need to support converting
to FBE after the fact anymore.  This was only ever a developer option,
so it probably wasn't used much.  And in any case, it's not used
anymore, as isConvertibleToFBE() is hard-coded to return false.  Besides
the fact that FBE has been required for several releases now, this
functionality was only ever available on devices that use FDE (Full Disk
Encryption), but FDE support has been removed from Android.

Therefore, remove this unused code.

Bug: 208476087
Change-Id: I1f56c8e05fb3fba09aab4bf5f8609b0f552b8999
2022-03-10 22:48:49 +00:00
Xin Li
6e1dcc84bd Merge "Merge Android 12L" 2022-03-08 06:51:47 +00:00
Xin Li
7381b4d493 Merge Android 12L
Bug: 222710654
Merged-In: I68c31f5fafc31f74d2c10a99fde3d0a4ff961002
Change-Id: I67a95c4a82548e24d2792aef15a01642106f5c77
2022-03-08 00:13:46 +00:00
Treehugger Robot
60b8b4dd61 Merge "Move comment to license_note" am: ee848e4f53
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2007799

Change-Id: I68c31f5fafc31f74d2c10a99fde3d0a4ff961002
2022-03-04 19:26:09 +00:00
Treehugger Robot
ee848e4f53 Merge "Move comment to license_note" 2022-03-04 18:50:37 +00:00
Bob Badour
483f32fcc0 Move comment to license_note
Comments not preserved during refresh.

Test: m nothing
Change-Id: Ifc9ae45d17316f7fc826f35369484e3668e69127
2022-03-03 14:39:11 -08:00
Treehugger Robot
3024caac9a Merge "Fix non-ab fuse ota fail bug" am: 13907aef6b
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1933118

Change-Id: I819e1e9fc1bf3b9b87cd4b5a388bb1030071e906
2022-03-01 19:04:40 +00:00
Treehugger Robot
13907aef6b Merge "Fix non-ab fuse ota fail bug" 2022-03-01 18:40:12 +00:00
Cheng Chang
a0732906ae Fix non-ab fuse ota fail bug
Fix the 'Calculate the offset to last partial block' logic in
ReadBlockAligndData. If file_size % fuse_block_size_ < source_block_size_,
the origin map logic will get a wrong block address of last block.
This bug leads to the non-ab fuse ota fail.

Test: compare the md5 of origin pkg and pkg reading from fuse.
Change-Id: Ic5132a7e9919cc2e91390231be342b97421ea23e
2022-03-01 16:40:40 +08:00
Treehugger Robot
5188d3c59d Merge "Disable flaky recovery test" am: 3ca4bf9b8c
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1999432

Change-Id: I9ce498a8f71045ee0d0559f5ab6fa6c2d1de832b
2022-02-25 00:31:02 +00:00
Treehugger Robot
3ca4bf9b8c Merge "Disable flaky recovery test" 2022-02-25 00:04:34 +00:00
Kelvin Zhang
117f263ada Disable flaky recovery test
Non-AB is under-maintained for years. Disable flaky test for now.

Test: th
Bug: 191730720
Change-Id: I3634afe291e717c35216021d69be1d24c5b8e5de
2022-02-24 13:43:16 -08:00
Treehugger Robot
f92f815f9c Merge "Add timed out test files to tidy_timeout_srcs" am: a9a8f091cb
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1992172

Change-Id: I53e87a29b711c9d7c4b2bbd003d39ea525d24459
2022-02-19 03:23:07 +00:00
Treehugger Robot
a9a8f091cb Merge "Add timed out test files to tidy_timeout_srcs" 2022-02-19 02:59:28 +00:00
Chih-Hung Hsieh
af6d780eb2 Add timed out test files to tidy_timeout_srcs
* Timed out runs do not show any warning messages.
* These test files cannot finish clang-tidy runs with
  the following settings:
    TIDY_TIMEOUT=90
    WITH_TIDY=1
    CLANG_ANALYZER_CHECKS=1
* When TIDY_TIMEOUT is set, in Android continuous builds,
  tidy_timeout_srcs files will not be compiled by clang-tidy.
  When developers build locally without TIDY_TIMEOUT,
  tidy_timeout_srcs files will be compiled.
* Some of these test modules may be split into smaller ones,
  or disable some time consuming checks, and then
  enable clang-tidy to run within limited time.

Bug: 201099167
Test: make droid tidy-bootable-recovery_subset
Change-Id: I3c4606959ab70e339df201501356b24953d4fb8a
2022-02-17 22:03:12 -08:00
Treehugger Robot
01f1e6cd40 Merge "Perform data wipe in recovery if ota package has powerwash set" am: 266a01b799
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1985507

Change-Id: Ied34f9b71132b780220da42f017fe86b4c912ffa
2022-02-16 07:19:03 +00:00
Treehugger Robot
266a01b799 Merge "Perform data wipe in recovery if ota package has powerwash set" 2022-02-16 06:53:28 +00:00
Kelvin Zhang
a4208b5f90 Perform data wipe in recovery if ota package has powerwash set
Normally, if an ota package has --wipe_user_data flag, we set bootloader
parameter --wipe_data, so that next boot into bootloader will wipe
userdata. But this doesn't work in recovery, likely because after
recovery we don't reboot to bootloader, but directly boot into android.
Therefore perform data reset in recovery if the OTA package has
POWERWASH flag.

Bug: 203507329
Test: apply an OTA pkg with --wipe_user_data, verify that data wipe
happened

Change-Id: Icca4a5f74246bde44a5fd589395404c9f57867ee
2022-02-14 20:20:08 -08:00
Treehugger Robot
65700df1fe Merge "Enable different interface for fastboot for cf" am: 46a3704702
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1909592

Change-Id: I37e7d026b57f0eb55001546a98bf41209d938d5b
2022-02-15 03:36:45 +00:00
Treehugger Robot
46a3704702 Merge "Enable different interface for fastboot for cf" 2022-02-15 03:14:08 +00:00
Ram Muthiah
469fc99188 Enable different interface for fastboot for cf
Bug: 209707539
Test: fastboot -s tcp:$local_link_addr%cvd-ebr getvar all
Change-Id: If58b7d99156bb16b876239ad0b71e2317a24f790
2022-02-14 17:17:52 -08:00
Xin Li
6d3993bab0 Merge sc-v2-dev-plus-aosp-without-vendor@8084891
Bug: 214455710
Merged-In: I3aa37a2a54caa0974cce0e3ec678845c19e33788
Change-Id: I17b26ebe40f605bee7d998be6dc41f51d74ee1d0
2022-02-11 06:56:21 +00:00
Treehugger Robot
f15415c679 Merge "Fix typo in static_assert message." am: 18ce153339
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1977750

Change-Id: I0f8ca848f903a0fc356a9703d040f5e907448db7
2022-02-10 21:03:28 +00:00
Treehugger Robot
18ce153339 Merge "Fix typo in static_assert message." 2022-02-10 20:45:01 +00:00
Florian Mayer
0b6adb583c Fix typo in static_assert message.
Change-Id: I54ed5c26df8bc0ab4d4f6ab706ec2be0e07122a7
2022-02-09 19:52:09 +00:00
Treehugger Robot
3a012a971a Merge "minui: add hall sensor event" am: 13c721f330
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1870215

Change-Id: Icff84ca0ec9330d57cd66955f6f33129a0ff3507
2022-01-26 05:59:04 +00:00
Treehugger Robot
f8d4273171 Merge "minui: Add support for multiple connectors" am: 80a9dcad35
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1883848

Change-Id: I2422cf7153af07785be8d6e2de552b41047e9e7c
2022-01-26 05:58:42 +00:00
Treehugger Robot
13c721f330 Merge "minui: add hall sensor event" 2022-01-26 05:47:17 +00:00
Treehugger Robot
80a9dcad35 Merge "minui: Add support for multiple connectors" 2022-01-26 05:42:52 +00:00
Jack Wu
90b94b72ff minui: add hall sensor event
Bug: 191831427
Bug: 200907986
Test: manual test
Signed-off-by: Jack Wu <wjack@google.com>
Change-Id: Ibb6f1e13344d33586398ac2e09430281bbe6d718
2022-01-25 10:02:50 +00:00
Weizhung Ding
f4dfa1adbb minui: Add support for multiple connectors
Add support for multiple connectors.

Bug: 194732653
Test: charging animation can be displayed on different connectors
Change-Id: If9b9eac25ce6e4c582aeb7c52e94ca266f623438
2022-01-25 16:49:55 +08:00
Florian Mayer
c652569b15 Merge "[MTE] Add interface to communicate MTE status to bootloader." am: 61152e4337
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1915327

Change-Id: Idce2ad5b01b5668dc077cf0c504515fd2ccf9cf2
2022-01-21 18:28:44 +00:00
Florian Mayer
61152e4337 Merge "[MTE] Add interface to communicate MTE status to bootloader." 2022-01-21 18:10:54 +00:00
Treehugger Robot
7951feda20 Merge "Add missing header include to libedify" am: 191a9da257 am: 99f1bd6a72 am: 2455ff0b8d
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1930749

Change-Id: I7d48128426f9ab8729ef1ecfb82a087144b82f56
2022-01-14 22:01:45 +00:00
Treehugger Robot
2455ff0b8d Merge "Add missing header include to libedify" am: 191a9da257 am: 99f1bd6a72
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1930749

Change-Id: If1ff329eecfb3b1da04fe5bdfe61d86c70b533d2
2022-01-14 21:44:35 +00:00
Treehugger Robot
99f1bd6a72 Merge "Add missing header include to libedify" am: 191a9da257
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1930749

Change-Id: Icc5293cbccad9299cc694be88d34339da5564391
2022-01-14 21:25:04 +00:00
Treehugger Robot
191a9da257 Merge "Add missing header include to libedify" 2022-01-14 21:06:48 +00:00
Treehugger Robot
6f372cc3b9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: fda86a9d3d -s ours am: f25133183a -s ours am: e46e511459 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4b09de57c96fb677795c4815d917e0d34f0a88d7
2022-01-11 01:40:10 +00:00
Treehugger Robot
e46e511459 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: fda86a9d3d -s ours am: f25133183a -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia0fb69b804fdda808cbd10f87bfae21ad84240dc
2022-01-11 01:35:10 +00:00
Bill Yi
75cd1fcd30 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6b7c582de4 -s ours am: f54fdb8448 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I45dfaf0d5d820d9141172582235c154ddacc0f75
2022-01-11 01:35:09 +00:00
Treehugger Robot
f25133183a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: fda86a9d3d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7acf9e9d52cd64aad0cc293ea56e35baaa4e8607
2022-01-11 01:15:18 +00:00
Bill Yi
f54fdb8448 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6b7c582de4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I848e2151d6a7432f9e6603cfc0d78495920d83fb
2022-01-11 01:10:30 +00:00
Treehugger Robot
fda86a9d3d Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-01-11 00:49:09 +00:00
Bill Yi
e93c95aa15 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I3aa37a2a54caa0974cce0e3ec678845c19e33788
2022-01-10 16:47:44 +00:00