Tianjie Xu and android-build-merger
b2104dbcba
Merge "Drop the device specific support for update host simulator" am: fc2ad88770 am: 79e4e39be6 am: fd4d891c22
...
am: 7823451895
Change-Id: Ib767b478b4d40b030f44efb7725661bae86fd6a8
2019-07-14 16:41:07 -07:00
Tianjie Xu and android-build-merger
7823451895
Merge "Drop the device specific support for update host simulator" am: fc2ad88770 am: 79e4e39be6
...
am: fd4d891c22
Change-Id: I5d3acd33483390791ab97af31cb973bab2e19358
2019-07-14 16:32:05 -07:00
Tianjie Xu and android-build-merger
fd4d891c22
Merge "Drop the device specific support for update host simulator" am: fc2ad88770
...
am: 79e4e39be6
Change-Id: I89f8934d463532b498216b636ab1d03463d5692a
2019-07-14 16:23:05 -07:00
Tianjie Xu and android-build-merger
79e4e39be6
Merge "Drop the device specific support for update host simulator"
...
am: fc2ad88770
Change-Id: I2d0b32a139ac02952e1c365849b2036d74fad1bf
2019-07-14 16:13:05 -07:00
Tianjie Xu and Gerrit Code Review
fc2ad88770
Merge "Drop the device specific support for update host simulator"
2019-07-14 22:49:59 +00:00
David Anderson and android-build-merger
8c32ca6f41
Merge "Fix build for API change to DestroyLogicalPartition()." am: 4c8e6eae28 am: d3d51e5066 am: e203476c67
...
am: 4594d0cab4
Change-Id: If9f634e00b1e707fd063de049fc11d35a265ae91
2019-07-13 11:44:04 -07:00
David Anderson and android-build-merger
4594d0cab4
Merge "Fix build for API change to DestroyLogicalPartition()." am: 4c8e6eae28 am: d3d51e5066
...
am: e203476c67
Change-Id: I15f9dd0b3b06be0c0d0021f3f74ec0772f0bd14b
2019-07-13 11:36:03 -07:00
David Anderson and android-build-merger
e203476c67
Merge "Fix build for API change to DestroyLogicalPartition()." am: 4c8e6eae28
...
am: d3d51e5066
Change-Id: I92db6e376ef7f4ff5979e31b830b6d17a6886c03
2019-07-13 11:26:04 -07:00
David Anderson and android-build-merger
d3d51e5066
Merge "Fix build for API change to DestroyLogicalPartition()."
...
am: 4c8e6eae28
Change-Id: Ifdc9b9560114d89c53ba99e5dc360769e157cdab
2019-07-13 11:18:02 -07:00
David Anderson and Gerrit Code Review
4c8e6eae28
Merge "Fix build for API change to DestroyLogicalPartition()."
2019-07-13 18:02:05 +00:00
Tianjie Xu
b42281a423
Drop the device specific support for update host simulator
...
The device specific libs prevent us from building an universal simulator to add
to the otatools. Drop the support since there is currently no active users of the
simulator extension; plus we will unlikely to implement the device specific simulator
runtime.
As a alternation, we will add the commandline arguments to skip certain unsupported
functions, and move the simulator build to the bp file.
Bug: 131911365
Test: mma
Change-Id: I3ff0f45dbebe3ed72d5f4670a869b40e6cfd5a7c
2019-07-12 11:55:59 -07:00
Tao Bao and android-build-merger
6843006b7f
[automerger skipped] minadbd sends heartbeat to rescue service for getprop command. am: 0bbb2ed53e -s ours
...
am: 2ff9fda870 -s ours
am skip reason: change_id Ib9d5ed710cfa94ecfe6cf393a71a0b67b2539531 with SHA1 2223e6a9f8 is in history
Change-Id: I00c6a935062a6056d60487416b23bc740cf0199a
2019-07-11 10:29:29 -07:00
Tao Bao and android-build-merger
2ff9fda870
[automerger skipped] minadbd sends heartbeat to rescue service for getprop command.
...
am: 0bbb2ed53e -s ours
am skip reason: change_id Ib9d5ed710cfa94ecfe6cf393a71a0b67b2539531 with SHA1 2223e6a9f8 is in history
Change-Id: I10b28b13c8f0ced560656aef2e4e0fd512060ff6
2019-07-11 10:20:26 -07:00
Tao Bao
0bbb2ed53e
minadbd sends heartbeat to rescue service for getprop command.
...
We start minadbd and rescue services in two processes. In particular,
minadbd handles the requests from host, then communicates with rescue
service to do install/wipe works. When resuce service doesn't see any
request in a pre-defined timeout (currently 300s), rescue service will
exit to avoid endless waiting.
This CL changes minadbd to additionally send a no-op command to rescue
service as a heartbeat signal, so that host side can finish
time-consuming operations (e.g. downloading over network) while keeping
rescue service alive.
Bug: 136457446
Test: Enter resuce mode on blueline. Send `adb rescue getprop
ro.build.fingerprint` and check that rescue service doesn't exit.
Test: Stop sending the getprop command. Check that rescue service exits
after 300s.
Change-Id: Ib9d5ed710cfa94ecfe6cf393a71a0b67b2539531
Merged-In: Ib9d5ed710cfa94ecfe6cf393a71a0b67b2539531
(cherry picked from commit 2223e6a9f8 )
2019-07-10 22:32:51 -07:00
Tianjie Xu and android-build-merger
a09e8dcfd5
Merge "Remove libimgpatch" am: ed96da6664 am: 36385bd9ee am: be4712aabd
...
am: 04708fe48e
Change-Id: I33fb24ed719ec56c36889cd296e3e988225b6993
2019-07-10 18:51:46 -07:00
Tianjie Xu and android-build-merger
04708fe48e
Merge "Remove libimgpatch" am: ed96da6664 am: 36385bd9ee
...
am: be4712aabd
Change-Id: Iea6726eeaf2651c848dc4f4a64d05bc51e8bd389
2019-07-10 18:41:39 -07:00
Tianjie Xu and android-build-merger
be4712aabd
Merge "Remove libimgpatch" am: ed96da6664
...
am: 36385bd9ee
Change-Id: I8ed0f92329550c4b643e8f52ad8471bce1e79769
2019-07-10 18:26:47 -07:00
Tianjie Xu and android-build-merger
36385bd9ee
Merge "Remove libimgpatch"
...
am: ed96da6664
Change-Id: Id263dad2ce56b5268af5e65ee8d1cc55d2967e56
2019-07-10 18:04:27 -07:00
Treehugger Robot and Gerrit Code Review
ed96da6664
Merge "Remove libimgpatch"
2019-07-11 00:38:02 +00:00
Tao Bao and android-build-merger
4c545f47b5
Merge "minadbd sends heartbeat to rescue service for getprop command." am: 89cc79cbb6 am: d9ec0bbd06 am: bf57406110
...
am: c05656e15c
Change-Id: I292fec22ddf06d3006886c515539a0f460b89fe7
2019-07-10 14:46:16 -07:00
Tianjie Xu and android-build-merger
1e05bed931
Merge "Add a new key_pressed_mutex" am: 33bb113af2 am: e99f4e88a2 am: f9a2f996bf
...
am: 68594b1126
Change-Id: I083f05702e9fef7367dcafa0060fbcdbf78f7e07
2019-07-10 14:42:06 -07:00
Tao Bao and android-build-merger
c05656e15c
Merge "minadbd sends heartbeat to rescue service for getprop command." am: 89cc79cbb6 am: d9ec0bbd06
...
am: bf57406110
Change-Id: I75b02b98bbc9a7f4fc38db191f91ca37dac655c9
2019-07-10 14:27:27 -07:00
Tianjie Xu and android-build-merger
68594b1126
Merge "Add a new key_pressed_mutex" am: 33bb113af2 am: e99f4e88a2
...
am: f9a2f996bf
Change-Id: I588427bc50886b0aac8262308bdff7f24921ec5f
2019-07-10 14:23:14 -07:00
Tianjie Xu and android-build-merger
3d6302fcf6
Merge "Create a fallback to install from fuse if mmap fails" am: 5f408dd48a am: 0c666e3d5d am: f6e8941ee9
...
am: 2bd8b55e62
Change-Id: I92691d499a53f11a80d445408f75825b34ce79e1
2019-07-10 14:17:35 -07:00
Tao Bao and android-build-merger
bf57406110
Merge "minadbd sends heartbeat to rescue service for getprop command." am: 89cc79cbb6
...
am: d9ec0bbd06
Change-Id: Iddc44d7ae5eda8686713871046a713207e86f91b
2019-07-10 14:09:58 -07:00
Tianjie Xu and android-build-merger
f9a2f996bf
Merge "Add a new key_pressed_mutex" am: 33bb113af2
...
am: e99f4e88a2
Change-Id: I595e163e0cfc5c0247abe2eebc95dce32e154a63
2019-07-10 14:09:42 -07:00
Tianjie Xu and android-build-merger
2bd8b55e62
Merge "Create a fallback to install from fuse if mmap fails" am: 5f408dd48a am: 0c666e3d5d
...
am: f6e8941ee9
Change-Id: I7510357cd990cf058c4981a315f8c2cba7d61e5a
2019-07-10 14:08:10 -07:00
Tianjie Xu and android-build-merger
f6e8941ee9
Merge "Create a fallback to install from fuse if mmap fails" am: 5f408dd48a
...
am: 0c666e3d5d
Change-Id: Ifc0bdb1fedc35dd16138706b4112bac21843b4ea
2019-07-10 13:59:32 -07:00
Tao Bao and android-build-merger
d9ec0bbd06
Merge "minadbd sends heartbeat to rescue service for getprop command."
...
am: 89cc79cbb6
Change-Id: Ia150b81bbb224db0fd6293d6a95bcc788e62cc49
2019-07-10 13:49:01 -07:00
Tianjie Xu and android-build-merger
e99f4e88a2
Merge "Add a new key_pressed_mutex"
...
am: 33bb113af2
Change-Id: Ic9de2f770616aade4de13061b38540ed480f73f6
2019-07-10 13:48:44 -07:00
Tianjie Xu and android-build-merger
0c666e3d5d
Merge "Create a fallback to install from fuse if mmap fails"
...
am: 5f408dd48a
Change-Id: Ie8a54863426bb3558600b96c2ef7338eb0171cd3
2019-07-10 13:41:30 -07:00
Tao Bao and Gerrit Code Review
89cc79cbb6
Merge "minadbd sends heartbeat to rescue service for getprop command."
2019-07-10 19:52:44 +00:00
Tianjie Xu
45c40ec876
Remove libimgpatch
...
Stop building libimgpatch as it's merely a subset of libapplypatch.
Test: unit tests pass
Change-Id: I0735ec053344404434a50e53a36e3f55964c2e4f
2019-07-10 12:41:45 -07:00
Tianjie Xu and Gerrit Code Review
33bb113af2
Merge "Add a new key_pressed_mutex"
2019-07-10 17:46:27 +00:00
Tianjie Xu and Gerrit Code Review
5f408dd48a
Merge "Create a fallback to install from fuse if mmap fails"
2019-07-10 17:40:37 +00:00
Justin Yun and android-build-merger
ec14508254
Merge "Change the symlink to system_ext" am: c992962503 am: 29adb8f0f2 am: e4e0fa1d1e
...
am: 223d8250f5
Change-Id: I3541869e2e18936587b62c937c5f0062b9aedd79
2019-07-09 22:31:23 -07:00
Justin Yun and android-build-merger
223d8250f5
Merge "Change the symlink to system_ext" am: c992962503 am: 29adb8f0f2
...
am: e4e0fa1d1e
Change-Id: Ib1cd6099db5acc213351d857b238075dba91945f
2019-07-09 22:22:19 -07:00
Justin Yun and android-build-merger
e4e0fa1d1e
Merge "Change the symlink to system_ext" am: c992962503
...
am: 29adb8f0f2
Change-Id: I4b5e05fc6380984c6e1a0fc87fc40f790ee20520
2019-07-09 22:13:17 -07:00
Justin Yun and android-build-merger
29adb8f0f2
Merge "Change the symlink to system_ext"
...
am: c992962503
Change-Id: I3dcd6e9acd6d661eea7c20fbd362761fd7a5011e
2019-07-09 22:05:14 -07:00
Treehugger Robot and Gerrit Code Review
c992962503
Merge "Change the symlink to system_ext"
2019-07-10 04:39:52 +00:00
Tao Bao and android-build-merger
6ccf3a732c
Merge "recovery_ui: Remove RecoveryUI::last_key." am: 04b4ff695d am: 4324e07a29 am: 4b6a9c52ea
...
am: dd23db9412
Change-Id: I559d88aae69df32ce7a0479e07cfa32dbfdf57c4
2019-07-09 17:43:57 -07:00
Tao Bao and android-build-merger
dd23db9412
Merge "recovery_ui: Remove RecoveryUI::last_key." am: 04b4ff695d am: 4324e07a29
...
am: 4b6a9c52ea
Change-Id: I70124176e121858cbe19f79fc351d8c386535b4c
2019-07-09 17:18:57 -07:00
Tianjie Xu
b8a959b00f
Add a new key_pressed_mutex
...
The following variables in recovery ui were protected by
key_queue_mutex. But the purpose of key_queue_mutex is to protect the
key_queue, which will be changed after we already have a key code. So
getting the key pressed should be orthogonal to the key queue. And
adding a mutex will help to avoid deadlocks in b/135078366.
Variables include:
char key_pressed[KEY_MAX + 1];
int key_last_down;
bool key_long_press;
int key_down_count;
bool enable_reboot;
Bug: 135078366
Test: boot into recovery and press keys
Change-Id: Ie2cfcf1f2fec49b53f8fac97aa9a2c60f15b84f9
2019-07-09 16:47:07 -07:00
Tao Bao and android-build-merger
4b6a9c52ea
Merge "recovery_ui: Remove RecoveryUI::last_key." am: 04b4ff695d
...
am: 4324e07a29
Change-Id: Ia14ad137f562e59cfd22c5665598e1dbef1b8a87
2019-07-09 16:38:29 -07:00
Justin Yun
ea3c4a4948
Change the symlink to system_ext
...
As system_ext partition will be linked to system/system_ext, update
the path to system/system_ext.
Bug: 134359158
Test: build
Change-Id: I5a49adfe7e045e24bf6dfbf6990a965b8a5e1ce1
2019-07-09 23:33:26 +00:00
Tao Bao and android-build-merger
4324e07a29
Merge "recovery_ui: Remove RecoveryUI::last_key."
...
am: 04b4ff695d
Change-Id: If9f78bd849948a80eaadfbfedc81c4ee3d94ff05
2019-07-09 16:27:30 -07:00
Tao Bao and Gerrit Code Review
04b4ff695d
Merge "recovery_ui: Remove RecoveryUI::last_key."
2019-07-09 22:04:33 +00:00
Josh Gao and android-build-merger
5d3b4fbba6
Merge "minadbd: delete unnecessary fdevent.h include." am: e1701454b2 am: 32aeca8e78 am: fe0737868b
...
am: a96629a9bb
Change-Id: I8834c4cb307b3925eb1829d2261d6f11e581f763
2019-07-09 14:37:15 -07:00
Tianjie Xu
e521861508
Create a fallback to install from fuse if mmap fails
...
We may fail to memory map the package on 32 bit builds for packages with
2GiB+ size. This cl tries to install the package with fuse when memory map
fails in such cases.
Bug: 127071893
Test: build 32 bit version sailfish, push package and block.map, reboot into recovery with
the corresponding update_package argument.
Change-Id: I5dae4f3e27ccaf8d64ff3657d36f0e75db2330b0
2019-07-09 14:15:18 -07:00
Josh Gao and android-build-merger
a96629a9bb
Merge "minadbd: delete unnecessary fdevent.h include." am: e1701454b2 am: 32aeca8e78
...
am: fe0737868b
Change-Id: I44b9dc695019c1ac6dcd0a08b6102e7251c61142
2019-07-09 14:11:38 -07:00