Commit graph

10453 commits

Author SHA1 Message Date
Bill Yi
c2716f4361 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ib8ad53b541a4cedc6a3d69f14862e452de18d80e
2022-04-06 22:16:17 +00:00
Bill Yi
e03e3e13b6 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I4879eee86517fa958ea9873d425429921c794c48
2022-04-06 22:15:03 +00:00
Bill Yi
2211b66130 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: f1ac993359
Blank merge reason: commit message contains skip directive

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

Change-Id: I1b342a75f1a053f8ddb7a4e8fd161d3247167308
2022-04-06 22:11:28 +00:00
Bill Yi
f1ac993359 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I49eabbf6100652c954390c2674b352812d3595a8
2022-04-06 22:11:20 +00:00
Xin Li
ae03425d63 [automerger skipped] Merge Android 12 QPR3 ab/8391262 am: b58d4fcf35 -s ours am: 822cf94aa0 -s ours am: 555944e12f -s ours am: 25e6f22a9f -s ours
am skip reason: Merged-In I348aac2cfcf84032e2526d03cc0adc989d3d0153 with SHA-1 db22144a52 is already in history

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

Change-Id: I152e95ee34efa3c7fdf18f579a4d4257d57eaa9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-03 09:08:41 +00:00
Xin Li
25e6f22a9f [automerger skipped] Merge Android 12 QPR3 ab/8391262 am: b58d4fcf35 -s ours am: 822cf94aa0 -s ours am: 555944e12f -s ours
am skip reason: Merged-In I348aac2cfcf84032e2526d03cc0adc989d3d0153 with SHA-1 db22144a52 is already in history

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

Change-Id: I8323f1e27ce4755d3cfef6c94430e517cf5d1a10
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-03 08:30:47 +00:00
Xin Li
555944e12f [automerger skipped] Merge Android 12 QPR3 ab/8391262 am: b58d4fcf35 -s ours am: 822cf94aa0 -s ours
am skip reason: Merged-In I348aac2cfcf84032e2526d03cc0adc989d3d0153 with SHA-1 db22144a52 is already in history

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

Change-Id: I82709426e015bfdf05b1b991767c9564ddfa64c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-03 07:43:37 +00:00
Xin Li
822cf94aa0 [automerger skipped] Merge Android 12 QPR3 ab/8391262 am: b58d4fcf35 -s ours
am skip reason: Merged-In I348aac2cfcf84032e2526d03cc0adc989d3d0153 with SHA-1 db22144a52 is already in history

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

Change-Id: Ibe43263c0331367cc4d9d3b724a641d66a8d4695
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-03 07:11:36 +00:00
Xin Li
b58d4fcf35 Merge Android 12 QPR3 ab/8391262
Bug: 226662282
Merged-In: I348aac2cfcf84032e2526d03cc0adc989d3d0153
Change-Id: I3655929e9307512167df285c48f9de934586821e
2022-04-01 20:31:48 +00:00
Treehugger Robot
398df13422 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 5887c94640 -s ours am: 15526e76d2 -s ours am: db22144a52 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie8314dcc44e119c86163b5dc0b1d6638c2c5cc79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-28 08:03:18 +00:00
Bill Yi
b84350562c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4a90a95898 -s ours am: 4b1d99057d -s ours am: 2f240eb127 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I94d80e464e6babe145e869e57efe922edcb115b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-28 08:03:16 +00:00
Treehugger Robot
db22144a52 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 5887c94640 -s ours am: 15526e76d2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I348aac2cfcf84032e2526d03cc0adc989d3d0153
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-28 07:36:51 +00:00
Bill Yi
2f240eb127 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4a90a95898 -s ours am: 4b1d99057d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I985182b7889a158ea1fafcd360378b5c7ecd0654
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-28 07:36:49 +00:00
Bill Yi
6512b39c91 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 74358b5a15 -s ours am: 95ca15af7c -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie855c2e7823d77830b312430d4415054b6de7676
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-28 07:16:59 +00:00
Treehugger Robot
15526e76d2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 5887c94640 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If7ea2e6851196f899936394d8d6bb8023d25ea5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-28 07:02:22 +00:00
Bill Yi
4b1d99057d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4a90a95898 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie7d68d9e9f951cf0c9ccff937657fa387c0d9cf2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-28 07:02:20 +00:00
Bill Yi
95ca15af7c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 74358b5a15 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Icdcd16a699b354da4d167a9eef38a9d9983f13b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-28 06:53:06 +00: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
Bill Yi
74358b5a15 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I0ef125e2a7561cb05450853215ac168a2e946f30
2022-03-26 23:43:07 +00:00
Shikha Malhotra
d8c1cc4e7c Merge "Enable ProjectID by default." am: 29e218afd6 am: de26b580d7 am: 7c606c05ed
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2030163

Change-Id: I0550c056c78fb9c1d54b379ecdccbc95815960ba
2022-03-22 17:05:45 +00:00
Shikha Malhotra
7c606c05ed Merge "Enable ProjectID by default." am: 29e218afd6 am: de26b580d7
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2030163

Change-Id: I88c6a5c56b59df3fd6330f824f7add50010e7883
2022-03-22 17:04:53 +00:00
Shikha Malhotra
de26b580d7 Merge "Enable ProjectID by default." am: 29e218afd6
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2030163

Change-Id: Id87779000ce07048864c0959cdb682b861529810
2022-03-22 16:49:24 +00:00
Shikha Malhotra
29e218afd6 Merge "Enable ProjectID by default." 2022-03-22 16:32:39 +00:00
Eric Biggers
277904c1fe Merge "Remove support for converting from FDE to FBE" am: 37a4f4d243 am: a062eda2e8 am: 41475f64f7
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2026966

Change-Id: Ie4b9086e6ee8a1f44f2c82f5bc4a6b2387f0ea8c
2022-03-17 22:57:31 +00:00
Eric Biggers
41475f64f7 Merge "Remove support for converting from FDE to FBE" am: 37a4f4d243 am: a062eda2e8
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2026966

Change-Id: I8511caaee264218ca6fa1aaa310488b0446fa43d
2022-03-17 22:42:57 +00:00
Eric Biggers
a062eda2e8 Merge "Remove support for converting from FDE to FBE" am: 37a4f4d243
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2026966

Change-Id: I00095ffbebe62f5e1816fae41625f36b7171dd1c
2022-03-17 22:19:14 +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
3637c83b14 [automerger skipped] Merge "Merge Android 12L" am: 6e1dcc84bd -s ours am: 8f26d0a018 -s ours am: ab6fc1a11b -s ours
am skip reason: Merged-In I68c31f5fafc31f74d2c10a99fde3d0a4ff961002 with SHA-1 60b8b4dd61 is already in history

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

Change-Id: Ife76d4171b756e3a00ab988fc2a6b5f08b267de8
2022-03-09 10:05:01 +00:00
Xin Li
45f983bcf2 [automerger skipped] Merge Android 12L am: 7381b4d493 -s ours am: c821374937 -s ours am: f34c62428b -s ours
am skip reason: Merged-In I68c31f5fafc31f74d2c10a99fde3d0a4ff961002 with SHA-1 60b8b4dd61 is already in history

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

Change-Id: Ieb6d8d4e2f1cccd38898a8fbb8f6e9b2ec3601b6
2022-03-09 10:02:18 +00:00
Xin Li
ab6fc1a11b [automerger skipped] Merge "Merge Android 12L" am: 6e1dcc84bd -s ours am: 8f26d0a018 -s ours
am skip reason: Merged-In I68c31f5fafc31f74d2c10a99fde3d0a4ff961002 with SHA-1 60b8b4dd61 is already in history

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

Change-Id: I25d4c8162ea383e113058ead1939ba03c515690d
2022-03-08 11:06:32 +00:00
Xin Li
f34c62428b [automerger skipped] Merge Android 12L am: 7381b4d493 -s ours am: c821374937 -s ours
am skip reason: Merged-In I68c31f5fafc31f74d2c10a99fde3d0a4ff961002 with SHA-1 60b8b4dd61 is already in history

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

Change-Id: I5de41a76a0cbae93d5757163e487df2d085c03e6
2022-03-08 11:03:47 +00:00
Xin Li
8f26d0a018 [automerger skipped] Merge "Merge Android 12L" am: 6e1dcc84bd -s ours
am skip reason: Merged-In I68c31f5fafc31f74d2c10a99fde3d0a4ff961002 with SHA-1 60b8b4dd61 is already in history

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

Change-Id: Id1303261bcbc1acdd7653ceee4c6bf1061a24475
2022-03-08 10:21:44 +00:00
Xin Li
c821374937 [automerger skipped] Merge Android 12L am: 7381b4d493 -s ours
am skip reason: Merged-In I68c31f5fafc31f74d2c10a99fde3d0a4ff961002 with SHA-1 60b8b4dd61 is already in history

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

Change-Id: Ib4178b7ae4ea06d1afa22dc8689da422c1c79106
2022-03-08 10:18:56 +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
b0cba2dfe2 Merge "Move comment to license_note" am: ee848e4f53 am: 60b8b4dd61 am: 762ab9e86d
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2007799

Change-Id: I66f5a39c6b43b5451b77f20ed569c9b1ac9cf257
2022-03-04 20:31:13 +00:00
Treehugger Robot
762ab9e86d Merge "Move comment to license_note" am: ee848e4f53 am: 60b8b4dd61
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2007799

Change-Id: Iad0cae8635c6317eb6e261fab68cde56b0d26b7e
2022-03-04 19:59:36 +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
1f8cb01c69 Merge "Fix non-ab fuse ota fail bug" am: 13907aef6b am: 3024caac9a am: 7c3d40f7c7
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1933118

Change-Id: I5315f91b003809e14208acb64e91aadb395798a2
2022-03-01 19:51:50 +00:00
Treehugger Robot
7c3d40f7c7 Merge "Fix non-ab fuse ota fail bug" am: 13907aef6b am: 3024caac9a
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1933118

Change-Id: I1fd10eb131d3ae69e4328fcec32c0103260db45a
2022-03-01 19:29:32 +00: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
9ba6df09f1 Merge "Disable flaky recovery test" am: 3ca4bf9b8c am: 5188d3c59d am: e1abfc8476
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1999432

Change-Id: Id274bdc7b979efdcd1471112bd6cca5291c9c706
2022-02-25 01:26:47 +00:00
Treehugger Robot
e1abfc8476 Merge "Disable flaky recovery test" am: 3ca4bf9b8c am: 5188d3c59d
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1999432

Change-Id: Ie7ee867a82fb58e2af84e6a09784102edd6f45d0
2022-02-25 00:53:16 +00:00