Commit graph

10445 commits

Author SHA1 Message Date
Treehugger Robot
ce0b24454e Merge "Fix misconfigured recovery host test" am: 0f5c9f376b
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2175232

Change-Id: I909156ba395f33f41c00bd17fbcb1664f6a22a85
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-05 19:59:30 +00:00
Treehugger Robot
0f5c9f376b Merge "Fix misconfigured recovery host test" 2022-08-05 19:24:53 +00:00
Kelvin Zhang
9ce95441b2 Fix misconfigured recovery host test
Test: atest recovery_host_test
Bug: 241353143
Change-Id: I13bb9595745f65a63070cf9fe030c9155f75e4d0
2022-08-04 10:05:43 -07:00
Bill Yi
3a286d5fb0 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I4a3e640c8d316a092d2ab34bb12c0d3184025e5f
2022-07-03 13:53:37 -07:00
Treehugger Robot
cfeb1b9b9a Merge "Update static libs deps in recovery" am: c685fe9be8
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2061259

Change-Id: I56c9f0572212a20acaf01e426c97ee02b144a361
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30 00:42:20 +00:00
Treehugger Robot
c685fe9be8 Merge "Update static libs deps in recovery" 2022-06-30 00:15:42 +00:00
Xin Li
3d82b087ff Merge "Merge tm-dev-plus-aosp-without-vendor@8763363" into stage-aosp-master 2022-06-29 21:21:49 +00:00
Treehugger Robot
819c91a522 Merge "Convert recovery to use AIDL bootcontrol HAL" am: ab532fdfc7
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2135412

Change-Id: Ie4637afb2076cff47cbd03850274bc1d90cc19a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-29 17:10:57 +00:00
Treehugger Robot
ab532fdfc7 Merge "Convert recovery to use AIDL bootcontrol HAL" 2022-06-29 16:38:58 +00:00
Xin Li
82c91a626b Merge tm-dev-plus-aosp-without-vendor@8763363
Bug: 236760014
Merged-In: I28ab4357c9ac3e088776f92a0e1f7d390b4b0bdc
Change-Id: I9b4fcc9e25b097b4a3eaddb1772ac4ff191249a1
2022-06-28 21:23:05 +00:00
Kelvin Zhang
58bbe3c959 Update static libs deps in recovery
Transitive dependency, need to add lz4 as static lib.

Test: th
Bug: 228478555
Change-Id: Ic73ad115c2def057f1e1bcb84b8bed8cdc08c1e6
2022-06-28 12:05:05 -07:00
Florian Mayer
1671d67b94 Merge "[MTE] Reset memtag message on factory reset." am: a2a93106b7
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2134979

Change-Id: Iec72218768552697581055d78d1f52ce6504bc9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-28 18:47:30 +00:00
Florian Mayer
a2a93106b7 Merge "[MTE] Reset memtag message on factory reset." 2022-06-28 18:21:12 +00:00
Florian Mayer
21d50b280f [MTE] Reset memtag message on factory reset.
Bug: 235255174
Test: https://gist.github.com/fmayer/8900b52636574ee079fa1943e5da918e
Change-Id: If42faa0417f9717d66eaa4247a88de61985b21b0
2022-06-23 13:39:22 -07:00
Baligh Uddin
f0b82ceab2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8f7da713e4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib21407a03c29faa6865a3f9da8e9c1ae5f4b4447
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-23 18:13:26 +00:00
Baligh Uddin
8f7da713e4 Import translations. DO NOT MERGE ANYWHERE
Change-Id: I4af0e47335c834694ee18201e11d09bf0e302477
2022-06-23 16:43:25 +00:00
Kelvin Zhang
fa554fed44 Convert recovery to use AIDL bootcontrol HAL
Test: th
Bug; 227536004

Change-Id: I14c0c337c931d10c9b9865a1c15eaff8fedf191e
2022-06-22 14:46:05 -07:00
Florian Mayer
260aca6c76 Merge "Add MISC_MEMTAG_MODE_MEMTAG_OFF." am: 6adffc35b6 am: 8ebd36dd63
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2125599

Change-Id: Ia3bebdd9f40ef3c6027d4954ebc84637fbd1c83f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-22 18:39:37 +00:00
Florian Mayer
8ebd36dd63 Merge "Add MISC_MEMTAG_MODE_MEMTAG_OFF." am: 6adffc35b6
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2125599

Change-Id: Idb37b725c41b4082371702894d257b904c379ce3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-22 18:11:16 +00:00
Florian Mayer
6adffc35b6 Merge "Add MISC_MEMTAG_MODE_MEMTAG_OFF." 2022-06-22 17:55:18 +00:00
Treehugger Robot
1e88183502 [automerger skipped] Merge "DO NOT MERGE - Skip SQ3A.220605.009" am: 9d6ba81589 -s ours am: 0a0cf0e8e7 -s ours
am skip reason: Merged-In I1a3e3f0be9b79ec4c309be8e257afbacd1336cdc with SHA-1 0f3b76b764 is already in history

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

Change-Id: I131a8935257e8da0367edf222e49f0d3100cc285
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-17 21:28:14 +00:00
Xin Li
ff7d4a3eb4 [automerger skipped] DO NOT MERGE - Skip SQ3A.220605.009 am: b8042c8705 -s ours am: 8330ca8c4e -s ours
am skip reason: Merged-In I1a3e3f0be9b79ec4c309be8e257afbacd1336cdc with SHA-1 0f3b76b764 is already in history

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

Change-Id: Ia1f087610de6b4bd448d9a989cb162d384dc9adb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-17 21:27:25 +00:00
Treehugger Robot
0a0cf0e8e7 [automerger skipped] Merge "DO NOT MERGE - Skip SQ3A.220605.009" am: 9d6ba81589 -s ours
am skip reason: Merged-In I1a3e3f0be9b79ec4c309be8e257afbacd1336cdc with SHA-1 0f3b76b764 is already in history

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

Change-Id: I7dc334fb86be1e1d5ad6f1a37117dd23ebc992b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-17 20:07:20 +00:00
Xin Li
8330ca8c4e [automerger skipped] DO NOT MERGE - Skip SQ3A.220605.009 am: b8042c8705 -s ours
am skip reason: Merged-In I1a3e3f0be9b79ec4c309be8e257afbacd1336cdc with SHA-1 0f3b76b764 is already in history

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

Change-Id: I43bf7569480b689d239a2022335bf633e84bd69b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-17 20:06:28 +00:00
Treehugger Robot
9d6ba81589 Merge "DO NOT MERGE - Skip SQ3A.220605.009" 2022-06-17 14:29:01 +00:00
Xin Li
b8042c8705 DO NOT MERGE - Skip SQ3A.220605.009
Bug: 236045730
Merged-In: I1a3e3f0be9b79ec4c309be8e257afbacd1336cdc
Change-Id: Ib017b0dfa357aaeabd24d7b0f44059b804de36ae
2022-06-16 22:50:38 -07:00
Treehugger Robot
729a613431 Merge "Adding adbd module OWNERS for minadbd compilation unit as well." am: 3dbcd4bfd7 am: c50c43c85d
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2123773

Change-Id: I7d1a49e9e62fd90b6cc3dde9f5bb584ab46a7f9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15 01:26:10 +00:00
Treehugger Robot
c50c43c85d Merge "Adding adbd module OWNERS for minadbd compilation unit as well." am: 3dbcd4bfd7
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2123773

Change-Id: I264a7c5df3ccc57e357958af3af0589fdc2d0b0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15 00:55:48 +00:00
Florian Mayer
29ace0ba4c Add MISC_MEMTAG_MODE_MEMTAG_OFF.
This can be used as a killswitch to disable MTE from userspace.

Change-Id: I28ab4357c9ac3e088776f92a0e1f7d390b4b0bdc
2022-06-15 00:02:16 +00:00
Treehugger Robot
3dbcd4bfd7 Merge "Adding adbd module OWNERS for minadbd compilation unit as well." 2022-06-14 23:19:36 +00:00
Shaju Mathew
7a4ba1956a Adding adbd module OWNERS for minadbd compilation unit as well.
Test: N/A (applicable only for source management).

Signed-off-by: Shaju Mathew <shaju@google.com>
Change-Id: I644993fb09f1aa9b983b3eab94ed16826a1df39d
2022-06-13 23:31:09 +00:00
Treehugger Robot
43995f88c9 Merge "Track API change." am: 8318e3087b am: 305cc54c0b
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1955382

Change-Id: Ica404973a5f4ce9093bfabe27afe50dde98891a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 18:11:25 +00:00
Treehugger Robot
305cc54c0b Merge "Track API change." am: 8318e3087b
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1955382

Change-Id: I99c19dbd03f9bbc459538040d1b1ab5cae015c91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 17:41:18 +00:00
Treehugger Robot
8318e3087b Merge "Track API change." 2022-06-13 17:14:01 +00:00
Treehugger Robot
c1d2c3514c Merge "Fix logical bugs around access() POSIX call" am: e50efc781a am: f6f84d04b2
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2118747

Change-Id: I76850b86e6e4a207492a6101488a789f6d3087f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09 23:45:21 +00:00
Akilesh Kailash
b53f8264ce Merge "update_verifier: Verify blocks" am: 5614437de3 am: b71f7757be
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2039129

Change-Id: I58c7e33784418c9576ced53af4b379c1fcd32ad8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09 23:45:04 +00:00
Treehugger Robot
f6f84d04b2 Merge "Fix logical bugs around access() POSIX call" am: e50efc781a
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2118747

Change-Id: Ic3c0ce1161b34d3edc2966d4622fc45460ca335d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09 23:11:02 +00:00
Akilesh Kailash
b71f7757be Merge "update_verifier: Verify blocks" am: 5614437de3
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2039129

Change-Id: I53d5a16f78d647dbec57abc51b5d5208313443e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09 23:03:33 +00:00
Treehugger Robot
e50efc781a Merge "Fix logical bugs around access() POSIX call" 2022-06-09 22:50:35 +00:00
Akilesh Kailash
5614437de3 Merge "update_verifier: Verify blocks" 2022-06-09 22:43:32 +00:00
Akilesh Kailash
dc1f6dadef update_verifier: Verify blocks
Check if the block verification was already done
by snapuserd daemon - If so, skip the verification
process. If daemon failed to verify the block,
update_verifier will fallback and continue
the verification.

Bug: 193863442
Test: OTA
Signed-off-by: Akilesh Kailash <akailash@google.com>
Change-Id: I18946fb730376f19cce0738bd6765d5f5d0248b6
2022-06-08 06:28:08 +00:00
Artem Yudin
0cd72a9b62 Fix logical bugs around access() POSIX call
According to docs of access():
If the specified access is permitted, access() returns 0.
If the given file cannot be accessed in the specified way, access() returns -1

See my comment: https://android-review.googlesource.com/c/platform/bootable/recovery/+/883392/comments/e9b76d97_f4cab88d

Test: builds
Bug: 234887937
Change-Id: I5712d61e967566246603f23a62e2c7b708130b0d
2022-06-07 17:19:23 -07:00
Treehugger Robot
19bc443994 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 94bb8a80c7 -s ours am: 03ddefaaca -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia894c3677a4f1204296e3b8c56d0e260cc82a2d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 21:02:08 +00:00
Bill Yi
7bba14c4db [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dff2898c21 -s ours am: 0a0ee7645c -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ibfcd2099ccd4624f145900127b364f616288e48d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 21:01:56 +00:00
Treehugger Robot
03ddefaaca [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 94bb8a80c7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I69ed2c017c42ceb5481ce5b18d07cfcbc3d24016
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 19:19:22 +00:00
Bill Yi
0a0ee7645c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dff2898c21 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I05542624f07e56108ba947438e870363b551a1f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 19:19:06 +00:00
Bill Yi
d8fd028597 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 13a9313958 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I401ac49f9875c320369cfb10dd1426252606aaa9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 19:14:41 +00:00
Treehugger Robot
94bb8a80c7 Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-06-06 18:31:02 +00:00
Bill Yi
dff2898c21 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I743e703cb2c2e449d4f51cea3e86e4575da0e9cf
2022-06-05 22:04:18 -07:00
Bill Yi
13a9313958 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I9adb95505d8382d46b08cc3daf52f8640610f76b
2022-06-05 21:40:37 -07:00