PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
8,060 Commits 1 Branch 0 Tags
4c545f47b558f6b01401736468927bfd1778dbd2
Commit Graph

8060 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tao Bao 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 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 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 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 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 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 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 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 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 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 e99f4e88a2 Merge "Add a new key_pressed_mutex" 
am: 33bb113af2

Change-Id: Ic9de2f770616aade4de13061b38540ed480f73f6
 2019-07-10 13:48:44 -07:00
Tianjie Xu 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 89cc79cbb6 Merge "minadbd sends heartbeat to rescue service for getprop command." 2019-07-10 19:52:44 +00:00
Tianjie Xu 33bb113af2 Merge "Add a new key_pressed_mutex" 2019-07-10 17:46:27 +00:00
Tianjie Xu 5f408dd48a Merge "Create a fallback to install from fuse if mmap fails" 2019-07-10 17:40:37 +00:00
Justin Yun 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 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 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 29adb8f0f2 Merge "Change the symlink to system_ext" 
am: c992962503

Change-Id: I3dcd6e9acd6d661eea7c20fbd362761fd7a5011e
 2019-07-09 22:05:14 -07:00
Treehugger Robot c992962503 Merge "Change the symlink to system_ext" 2019-07-10 04:39:52 +00:00
Tao Bao 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 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 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 4324e07a29 Merge "recovery_ui: Remove RecoveryUI::last_key." 
am: 04b4ff695d

Change-Id: If9f78bd849948a80eaadfbfedc81c4ee3d94ff05
 2019-07-09 16:27:30 -07:00
Tao Bao 04b4ff695d Merge "recovery_ui: Remove RecoveryUI::last_key." 2019-07-09 22:04:33 +00:00
Josh Gao 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 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
Josh Gao fe0737868b Merge "minadbd: delete unnecessary fdevent.h include." am: e1701454b2 
am: 32aeca8e78

Change-Id: I72b99fb7974be9e735cdd8637a4bfaea7afa5618
 2019-07-09 13:57:53 -07:00
Josh Gao 32aeca8e78 Merge "minadbd: delete unnecessary fdevent.h include." 
am: e1701454b2

Change-Id: Iaca242da9406d1d30e8e9ec4b7958bc11485e9d8
 2019-07-09 13:34:38 -07:00
Josh Gao e1701454b2 Merge "minadbd: delete unnecessary fdevent.h include." 2019-07-09 20:02:29 +00:00
Tao Bao 1df3ce7ea8 recovery_ui: Remove RecoveryUI::last_key. 
It's a private member, and the last user has been removed in [1] in
2015.

[1] commit ec28340cf3,
https://android-review.googlesource.com/c/platform/bootable/recovery/+/146330

Test: mmma -j bootable/recovery
Change-Id: I65a2370cb20a7b296888425a44a42c8b90abc766
 2019-07-09 11:21:18 -07:00
Tao Bao 2223e6a9f8 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
 2019-07-09 11:09:34 -07:00
Robin Lee 3c18c36125 Merge "Add a GetMappedPackageLength to Updater" am: 5135d1f095 am: 254e5c940b am: 2040283730 
am: 0bbe38ed1e

Change-Id: Ie5fee017857e9f76184edb323da69c60b0c66942
 2019-07-08 18:20:17 -07:00
Robin Lee 0bbe38ed1e Merge "Add a GetMappedPackageLength to Updater" am: 5135d1f095 am: 254e5c940b 
am: 2040283730

Change-Id: Id1e061da1299c46814ff125efef3bda613f7f748
 2019-07-08 17:47:55 -07:00
Robin Lee 2040283730 Merge "Add a GetMappedPackageLength to Updater" am: 5135d1f095 
am: 254e5c940b

Change-Id: Ice3ba9af801cf9dfe4128248367088f090518043
 2019-07-08 17:36:32 -07:00
Robin Lee 254e5c940b Merge "Add a GetMappedPackageLength to Updater" 
am: 5135d1f095

Change-Id: I8368d36e84ba29f5f0bc88e89bcb606932d47a7a
 2019-07-08 17:11:35 -07:00
Treehugger Robot 5135d1f095 Merge "Add a GetMappedPackageLength to Updater" 2019-07-08 23:12:38 +00:00
Josh Gao 290322b060 minadbd: delete unnecessary fdevent.h include. 
Test: treehugger
Change-Id: I09e9850dabbd71bffbe568f240f9fde8b3743e5e
 2019-07-08 15:54:33 -07:00
Robin Lee 1cf8eb7559 Add a GetMappedPackageLength to Updater 
Corresponds to GetMappedPackageAddress.

There is at least one custom device recovery with an extension to copy
the package somewhere else as a backup. Ability to do this was removed
in change ag/955273.

Test: lunch cf_x86_tv-eng; make
Test: atest recovery_unit_test recovery_component_test
Change-Id: I0e61d8a8839c47721874526504ea03b9ca7bafa9
 2019-07-08 19:30:11 +02:00
Xin Li fafc3779e0 [automerger skipped] Merge "DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master" into stage-aosp-master am: 317fc9a2f1 -s ours am: a20839f5d9 
am: 6859bab6b8 -s ours
am skip reason: subject contains skip directive

Change-Id: Ib456c0c8ee2dd5e041e8ffcdbb08c1de01fa32cd
 2019-07-02 15:20:28 -07:00
Xin Li 6859bab6b8 [automerger skipped] Merge "DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master" into stage-aosp-master am: 317fc9a2f1 -s ours 
am: a20839f5d9

Change-Id: Ie3b14f8ec062de99e9f36222a52b0cb7762efcb1
 2019-07-02 14:51:45 -07:00
Xin Li 2cf14239d1 [automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master am: 457f7ea2fa -s ours am: 779d7d3a3d 
am: a93c7ebf80 -s ours
am skip reason: subject contains skip directive

Change-Id: I147bce10af9c1ba213c45407e0808d4f4cff336b
 2019-07-02 12:46:15 -07:00
Xin Li a20839f5d9 [automerger skipped] Merge "DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master" into stage-aosp-master 
am: 317fc9a2f1 -s ours
am skip reason: subject contains skip directive

Change-Id: I53af26cc12b7f14f235d525fc7d8ed85415bb7b7
 2019-07-02 11:59:45 -07:00
Xin Li a93c7ebf80 [automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master am: 457f7ea2fa -s ours 
am: 779d7d3a3d

Change-Id: Iff02a502acfab68f6e4d68c9fcafbf817901959d
 2019-07-02 11:33:55 -07:00
Xin Li 779d7d3a3d [automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master 
am: 457f7ea2fa -s ours
am skip reason: subject contains skip directive

Change-Id: Ib94a51bbc437761c7bbabb8f45d19102a57489d3
 2019-07-02 10:01:34 -07:00
TreeHugger Robot 317fc9a2f1 Merge "DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master" into stage-aosp-master 2019-07-02 07:41:03 +00:00
Tianjie Xu 42e8d5a878 Merge "Build libimgdiff as a host only library" am: 9341e970ba am: b84b6422fa am: 304c389360 
am: efdb35ac41

Change-Id: I15fbe315211bbe21ed32a7d467313b7ab72a7b57
 2019-07-01 22:36:42 -07:00