Suren Baghdasaryan
d631ac484d
[automerger skipped] Merge "DO NOT MERGE: Revert "Add libprocessgroup dependency"" am: 7548e0d6fa -s ours
...
am: 56d6cf2c94 -s ours
am skip reason: subject contains skip directive
Change-Id: Ifbbd4ba3de9c9f7725cd4a2232df9c83be09686b
2019-01-23 23:14:43 -08:00
Suren Baghdasaryan
56d6cf2c94
[automerger skipped] Merge "DO NOT MERGE: Revert "Add libprocessgroup dependency""
...
am: 7548e0d6fa -s ours
am skip reason: subject contains skip directive
Change-Id: I6ccebe2066001865d5d57b3e11f8b72827fd4e4d
2019-01-23 23:05:33 -08:00
Suren Baghdasaryan
7548e0d6fa
Merge "DO NOT MERGE: Revert "Add libprocessgroup dependency""
2019-01-24 06:57:55 +00:00
Ng Zhi An
737e6cc600
Merge "Check that install file exists before unlink" am: 05d48050c1
...
am: a04ff295cf
Change-Id: I00c9323e3c774f25d4c746e439d8c50bb75935b6
2019-01-23 21:54:11 -08:00
Ng Zhi An
a04ff295cf
Merge "Check that install file exists before unlink"
...
am: 05d48050c1
Change-Id: I2a216be7e2f055cc520405bd49f67c3dc18bc542
2019-01-23 21:47:17 -08:00
Treehugger Robot
05d48050c1
Merge "Check that install file exists before unlink"
2019-01-24 05:35:51 +00:00
Suren Baghdasaryan
9ce1d14ef6
DO NOT MERGE: Revert "Add libprocessgroup dependency"
...
This reverts commit 62d0c7873c .
Reason for revert: Broke AOSP
Change-Id: I88ef00ebce797f7fdca3678ab93fcae364453a8c
Signed-off-by: Suren Baghdasaryan <surenb@google.com >
2019-01-23 20:46:46 -08:00
Ng Zhi An
14417a5d2a
Check that install file exists before unlink
...
This will remove spurious error messages in logcat such as:
08-02 00:27:21.580 600 600 E /system/bin/recovery-persist: Failed to
unlink /data/misc/recovery/last_install: No such file or directory
since the install file doesn't exist in the first place.
Bug: None
Test: m
Change-Id: Ifaa95729c50efae4e641286dfbe1718aceb5f50a
2019-01-23 15:16:29 -08:00
Suren Baghdasaryan
73a460b06f
Merge "Add libprocessgroup dependency" am: 4475f7330a
...
am: bd36c3a8ec
Change-Id: Ib573f07c3a42d2e39f805e8a7dfda03d9f01d79f
2019-01-22 13:42:44 -08:00
Suren Baghdasaryan
bd36c3a8ec
Merge "Add libprocessgroup dependency"
...
am: 4475f7330a
Change-Id: Ia7d2a6c5d4bfb511e6417eaf1e81f76108415c6f
2019-01-22 13:04:21 -08:00
Suren Baghdasaryan
4475f7330a
Merge "Add libprocessgroup dependency"
2019-01-22 20:58:15 +00:00
Suren Baghdasaryan
62d0c7873c
Add libprocessgroup dependency
...
Because set_sched_policy is moved into libprocessgroup an additional
dependency is requred for recovery_component_test to build.
Exempt-From-Owner-Approval: janitorial
Bug: 111307099
Test: builds, boots
Merged-In: I7cf75e473ee1e2837940606c71d15be26db0c3f2
Change-Id: I7cf75e473ee1e2837940606c71d15be26db0c3f2
Signed-off-by: Suren Baghdasaryan <surenb@google.com >
2019-01-20 22:04:43 +00:00
Hridya Valsaraju
5792ea8690
Merge "e2fsck_static is no longer needed for remount" am: 725d7f8dfd
...
am: f1fd5ec266
Change-Id: I8593bdf9366e72bc165117fc1fe8414567984661
2019-01-16 18:02:46 -08:00
Hridya Valsaraju
f1fd5ec266
Merge "e2fsck_static is no longer needed for remount"
...
am: 725d7f8dfd
Change-Id: Ie67ab328d10aebd078a1a41fe48b79f6d4467ebe
2019-01-16 17:58:41 -08:00
Treehugger Robot
725d7f8dfd
Merge "e2fsck_static is no longer needed for remount"
2019-01-17 01:43:33 +00:00
Hridya Valsaraju
6f44c11357
e2fsck_static is no longer needed for remount
...
Remount will instead use overlayfs. If the device is not configured
to use overlayfs or if the device does not support dynamic partitions
but has chosed to setup an ext4-dedupe filesystem, e2fsck_static must
then be included in recovery.
Bug: 122115286
Test: fastboot flashall
Change-Id: I931282dbc67ff4ef53291bcbc5a078b500e5e807
2019-01-16 23:42:55 +00:00
Tao Bao
8df7ff0026
Merge "screen_ui: Trivial fix to append newline when logging." am: 594a63cc9d
...
am: fadc163b60
Change-Id: I8ccdaf85363fe03a59bd79dd67d5755c9a2d9f72
2019-01-16 15:36:51 -08:00
Tao Bao
fadc163b60
Merge "screen_ui: Trivial fix to append newline when logging."
...
am: 594a63cc9d
Change-Id: Ib2c433d68cbb38627b1b40919428ba337f617fe6
2019-01-16 15:27:44 -08:00
Tao Bao
594a63cc9d
Merge "screen_ui: Trivial fix to append newline when logging."
2019-01-16 23:14:09 +00:00
Tao Bao
a00b449e1f
screen_ui: Trivial fix to append newline when logging.
...
Noticed while debugging other issues.
Test: Boot and check recovery.log.
Change-Id: Id92265cff287b9de89efe5eea85581e63e31aeb2
2019-01-16 09:31:12 -08:00
Yifan Hong
dc97097fc0
Merge "updater: add functions to modify dynamic partition metadata" am: 27aa9404fc
...
am: 4def1e8a54
Change-Id: I6d9d00e94329b69ab13a526a83fe9ffb47b46978
2019-01-15 16:42:36 -08:00
Yifan Hong
4def1e8a54
Merge "updater: add functions to modify dynamic partition metadata"
...
am: 27aa9404fc
Change-Id: I0b432e53aba06129b01b34b56e169f05a564b77c
2019-01-15 16:26:47 -08:00
Yifan Hong
27aa9404fc
Merge "updater: add functions to modify dynamic partition metadata"
2019-01-16 00:10:58 +00:00
Yifan Hong
6f366ee4dd
Merge "Create stash dir recursively." am: 7a0b65472b
...
am: 32932a48f9
Change-Id: Id2b155a768e5cec4486bd778fa26a7cc4fe32602
2019-01-14 14:11:09 -08:00
Yifan Hong
8ff84d7cfb
updater: add functions to modify dynamic partition metadata
...
Test: sideload full OTA on cuttlefish
Test: sideload incremental OTA on cuttlefish (that grows
system, shrinks vendor, and move vendor to group foo)
Test: verify that /cache/recovery/cc46ebfd04058569d0c6c1431c6af6c1328458e4
exists (sha1sum of "system")
Bug: 111801737
Change-Id: Ibdf6565bc1b60f3665c01739b4c95a85f0261ae5
2019-01-14 14:01:13 -08:00
Yifan Hong
32932a48f9
Merge "Create stash dir recursively."
...
am: 7a0b65472b
Change-Id: I6f47807075044e6e71078db99988190ced32e157
2019-01-14 13:40:35 -08:00
Yifan Hong
7a0b65472b
Merge "Create stash dir recursively."
2019-01-14 20:56:57 +00:00
Yifan Hong
63f5260c6c
Create stash dir recursively.
...
When applying an OTA package onto the device in OTA mode,
if the recovery logs haven't been viewed, there is a chance
that /cache/recovery does not exist. Then, stash creation will
fail. Create stash directories recursively to avoid this error.
Test: without /cache/recovery, sideload the OTA on cuttlefish
Change-Id: I5cc01a067d866476a3594e795dcb5b15649e817b
2019-01-11 15:13:22 -08:00
Tao Bao
e8270a8e98
Merge "Use dynamically linked f2fs executables." am: 22a27f9965
...
am: ad4ce79b4d
Change-Id: I0fc7309dc6ab5a87d26677a0ed9f0d5c6f288b7a
2019-01-08 12:09:43 -08:00
Tao Bao
ad4ce79b4d
Merge "Use dynamically linked f2fs executables."
...
am: 22a27f9965
Change-Id: If4ed2288a513510569ce9411a20cdc4c962d9803
2019-01-08 12:05:29 -08:00
Tao Bao
22a27f9965
Merge "Use dynamically linked f2fs executables."
2019-01-08 19:49:20 +00:00
Yifan Hong
d2e801fb93
Merge "updater: erase ignores EOPNOTSUPP for BLKDISCARD" am: 08a8b40c91
...
am: 159d267cc6
Change-Id: I7dd0df6adbe7315326064e5b660432dc60be6495
2019-01-07 17:17:40 -08:00
Yifan Hong
159d267cc6
Merge "updater: erase ignores EOPNOTSUPP for BLKDISCARD"
...
am: 08a8b40c91
Change-Id: Iee6860b0dbeaafc06ca881148ca4ea99abaf4b3a
2019-01-07 17:11:37 -08:00
Yifan Hong
08a8b40c91
Merge "updater: erase ignores EOPNOTSUPP for BLKDISCARD"
2019-01-08 00:06:40 +00:00
Yifan Hong
363d624d53
updater: erase ignores EOPNOTSUPP for BLKDISCARD
...
Test: sideload on cuttlefish
Bug: 111801737
Change-Id: I784a2142049054f38d6b70c7af7e88a451996d83
2019-01-04 15:24:52 -08:00
Tao Bao
ae8c2ca3ea
Merge "minadbd: daemon_service_to_fd takes std::string_view." am: 72aa58dcf7
...
am: 29578b1117
Change-Id: I038edb2337aceaaa8586426d14a159c2806d9350
2019-01-02 13:33:13 -08:00
Tao Bao
29578b1117
Merge "minadbd: daemon_service_to_fd takes std::string_view."
...
am: 72aa58dcf7
Change-Id: I9a7d20d476e0be703657e7c332f393703a982b1a
2019-01-02 13:28:12 -08:00
Tao Bao
72aa58dcf7
Merge "minadbd: daemon_service_to_fd takes std::string_view."
2019-01-02 21:13:14 +00:00
Tao Bao
5de19e2e02
minadbd: daemon_service_to_fd takes std::string_view.
...
The caller of daemon_service_to_fd() in core adb has switched to
std::string_view in [1]. The mismatch breaks the sideload service, as it
picks up the wrong daemon_service_to_fd() when serving sideload.
[1] https://android-review.googlesource.com/c/platform/system/core/+/850392
Bug: 122171762
Test: `adb sideload` on taimen.
Change-Id: Ie828400768523c35c5576e2c029e38fc0ad0aff9
2019-01-02 09:40:46 -08:00
Tianjie Xu
2c08607e2b
Merge "Add a horizontal line at the end of the graphic menu" am: fc0665c701
...
am: 095b6858dd
Change-Id: I7719a231cf36730e3a2998c9142cdf002c6e5dda
2018-12-21 11:15:58 -08:00
Tianjie Xu
095b6858dd
Merge "Add a horizontal line at the end of the graphic menu"
...
am: fc0665c701
Change-Id: Idba56caeb2f002864ca2325fb5f130d3e25c2acc
2018-12-21 11:10:52 -08:00
Tianjie Xu
fc0665c701
Merge "Add a horizontal line at the end of the graphic menu"
2018-12-21 19:00:47 +00:00
Tao Bao
96e1f45c5d
Merge "Clean up the arg setup for exec(3)." am: f0c03e62a2
...
am: 1b94d3a35b
Change-Id: I0423c5476723a6d7e8687ae62d01dca24e256d41
2018-12-20 14:53:19 -08:00
Tao Bao
c674dfb584
Use dynamically linked f2fs executables.
...
It also reduces the space cost for devices using f2fs (e.g. crosshatch).
/sbin/mkfs.f2fs 722560 => /system/bin/make_f2fs 49568
/sbin/sload.f2fs 1182456 => /system/bin/sload_f2fs 150032
Test: Build and boot recovery on crosshatch. Factory reset.
Test: Install a non-A/B OTA package that formats a f2fs partition.
Change-Id: Ibe70c8d91a1d07e1c78ff9eac19b1f7955800161
2018-12-20 14:47:11 -08:00
Tao Bao
1b94d3a35b
Merge "Clean up the arg setup for exec(3)."
...
am: f0c03e62a2
Change-Id: I402eae7a950f10e3ceb99291db07e68dd91861e1
2018-12-20 14:36:02 -08:00
Tao Bao
f0c03e62a2
Merge "Clean up the arg setup for exec(3)."
2018-12-20 22:10:07 +00:00
xunchang
c7dbc735d2
Add a horizontal line at the end of the graphic menu
...
This is in line with the old behavior and the UI of TextMenu.
Bug: 121280655
Test: check the menu
Change-Id: I4b82b93187b2d02cfe5b31a9a8fb621d10dd5d8a
2018-12-20 11:36:55 -08:00
Tao Bao
3d69f0df96
Clean up the arg setup for exec(3).
...
Test: Build and boot into recovery on marlin. Factory reset.
Test: Build and install a non-A/B OTA that calls format.
Change-Id: I72416e775e237fc15ca5eff1036175a9eef43b76
2018-12-20 10:46:06 -08:00
Yifan Hong
081c05f395
Merge changes from topic "vintf_object_recovery_mount" am: 82fc6ae5b8
...
am: cc6eb0ee44
Change-Id: I8cf4a096c15d6ec8fc9239807c1b0fa698c25d36
2018-12-19 14:34:41 -08:00
Yifan Hong
a15b8d368d
Move parts of roots.cpp to libfs_mgr am: 0f339e27bb
...
am: 6e232ed3ce
Change-Id: I0bee9493d0fe53fe4fd5150b9e81b295eefb4f70
2018-12-19 14:34:21 -08:00