Commit Graph

8109 Commits

Author SHA1 Message Date
Tianjie Xu 3fb65450b3 Merge "Create a new function to return the help message for menu" am: 5d9f963e4e am: b25d741563 am: c234be1655 am: a89bb37a4c
am: 1c7a5d8421

Change-Id: I8a2aa73845761508b53a03428ee056ddba359429
2019-07-26 11:53:31 -07:00
Tianjie Xu 1c7a5d8421 Merge "Create a new function to return the help message for menu" am: 5d9f963e4e am: b25d741563 am: c234be1655
am: a89bb37a4c

Change-Id: I077384fda0680a73eaa7462773c9144d6d7fc0e2
2019-07-26 11:43:34 -07:00
Tianjie Xu a89bb37a4c Merge "Create a new function to return the help message for menu" am: 5d9f963e4e am: b25d741563
am: c234be1655

Change-Id: Iaa37ebadb460835f94d22eb5771359b10b3eb018
2019-07-26 11:33:27 -07:00
Tianjie Xu c234be1655 Merge "Create a new function to return the help message for menu" am: 5d9f963e4e
am: b25d741563

Change-Id: I3391b38b54596fa08001c39214ebcc98e87285cc
2019-07-26 11:22:24 -07:00
Tianjie Xu b25d741563 Merge "Create a new function to return the help message for menu"
am: 5d9f963e4e

Change-Id: I216097c1aea8ae73999ad9b880dd6898a3c94def
2019-07-26 11:13:22 -07:00
Tianjie Xu 5d9f963e4e Merge "Create a new function to return the help message for menu" 2019-07-26 17:39:20 +00:00
Tianjie Xu e5032219fe Create a new function to return the help message for menu
Then we can override this function in the device specific recovery ui;
and allow customizing the help message.

Bug: 137965958
Test: Check the menu on sailfish
Change-Id: I09f23166f4205c5edf6c62eb42c8ada0fa710b26
2019-07-25 13:22:03 -07:00
Tianjie Xu fb08675334 Merge "Clean up some global variables in common.h" am: 80c405f692 am: 168ce56022 am: 6f8e0ede72 am: 984dc5c263
am: 0ea09ffbe2

Change-Id: If9028f9d44ef9ae2f6da8c029ff6678240bf8dee
2019-07-24 18:39:21 -07:00
Tianjie Xu 0ea09ffbe2 Merge "Clean up some global variables in common.h" am: 80c405f692 am: 168ce56022 am: 6f8e0ede72
am: 984dc5c263

Change-Id: I5df6ce9f82a0535c844b9474dbe57dc4e6e9e316
2019-07-24 18:19:26 -07:00
Tianjie Xu 984dc5c263 Merge "Clean up some global variables in common.h" am: 80c405f692 am: 168ce56022
am: 6f8e0ede72

Change-Id: If07039b9393d328d88520cf56c95d7727bda5dc3
2019-07-24 17:57:11 -07:00
Tianjie Xu 6f8e0ede72 Merge "Clean up some global variables in common.h" am: 80c405f692
am: 168ce56022

Change-Id: I7bc150fa572bc9709263feefcd12f786f4393d15
2019-07-24 17:37:03 -07:00
Tianjie Xu 168ce56022 Merge "Clean up some global variables in common.h"
am: 80c405f692

Change-Id: Id50b466efaed118a6e7d1bac71c95000822be855
2019-07-24 17:26:53 -07:00
Tianjie Xu 80c405f692 Merge "Clean up some global variables in common.h" 2019-07-24 22:45:32 +00:00
Tianjie Xu 164c60a4f3 Clean up some global variables in common.h
Some global variables are only used for recovery.cpp and
recovery_main.cpp, remove them from common.h and handle their usage
accordingly. Variables include:
static constexpr int kRecoveryApiVersion;
extern struct selabel_handle* sehandle;
extern RecoveryUI* ui;
extern bool has_cache;
bool is_ro_debuggable();

Test: unit tests pass, boot into recovery mode and run graphic tests
Change-Id: If83a005786c9b38412731da97aaf85af69a3b917
2019-07-24 11:36:03 -07:00
Tianjie Xu e8a435e929 Merge "Add command line parser for simulator" am: 7965a95adc am: 94bc9e1010 am: 7aa310c3f5
am: 2d4d1b9609

Change-Id: Ic71d064d745bc3bd5195e49d1d4c9cd6eedce1db
2019-07-17 11:19:02 -07:00
Tianjie Xu 2d4d1b9609 Merge "Add command line parser for simulator" am: 7965a95adc am: 94bc9e1010
am: 7aa310c3f5

Change-Id: Id76e5c7d5db3c35402bd1ec3facf0748a90e184f
2019-07-17 11:08:42 -07:00
Tianjie Xu 7aa310c3f5 Merge "Add command line parser for simulator" am: 7965a95adc
am: 94bc9e1010

Change-Id: I563cd91537d42c20660a3f04907fea06a8c1fcb7
2019-07-17 10:59:41 -07:00
Tianjie Xu 94bc9e1010 Merge "Add command line parser for simulator"
am: 7965a95adc

Change-Id: Ifa759b9f07a671ad509b0847c30bda4c17edac6c
2019-07-17 10:44:25 -07:00
Tianjie Xu 7965a95adc Merge "Add command line parser for simulator" 2019-07-17 17:19:51 +00:00
Tao Bao c4d0b1905a Merge "[automerger skipped] minadbd sends heartbeat to rescue service for getprop command. am: dd0158ac60 -s ours am: ac6652d37d -s ours
am: 40f08bfc7c -s ours
am skip reason: change_id Ib9d5ed710cfa94ecfe6cf393a71a0b67b2539531 with SHA1 dd0158ac60 is in history

Change-Id: I53dec01a5517bf4d55a352523fa38a008d6136ae
2019-07-16 19:14:53 -07:00
Tao Bao 8042057f6e [automerger skipped] minadbd sends heartbeat to rescue service for getprop command. am: dd0158ac60 -s ours am: e64e670fab -s ours
am: db13a9bb58 -s ours
am skip reason: change_id Ib9d5ed710cfa94ecfe6cf393a71a0b67b2539531 with SHA1 0bbb2ed53e is in history

Change-Id: I7ffebae0e623793f0aed07eb7e5a73755ccf27ae
2019-07-16 19:14:32 -07:00
Android Build Merger (Role) 40f08bfc7c Merge "[automerger skipped] minadbd sends heartbeat to rescue service for getprop command. am: dd0158ac60 -s ours am: ac6652d37d -s ours am skip reason: change_id Ib9d5ed710cfa94ecfe6cf393a71a0b67b2539531 with SHA1 0bbb2ed53e is in history" into qt-r1-dev-plus-aosp 2019-07-17 01:55:41 +00:00
Tao Bao db13a9bb58 [automerger skipped] minadbd sends heartbeat to rescue service for getprop command. am: dd0158ac60 -s ours
am: e64e670fab -s ours
am skip reason: change_id Ib9d5ed710cfa94ecfe6cf393a71a0b67b2539531 with SHA1 0bbb2ed53e is in history

Change-Id: Ibe0aefbad6255e04c1df79e62d3808e75143a310
2019-07-16 18:55:30 -07:00
Tao Bao 4f7397b0f6 [automerger skipped] minadbd sends heartbeat to rescue service for getprop command. am: dd0158ac60 -s ours
am: ac6652d37d -s ours
am skip reason: change_id Ib9d5ed710cfa94ecfe6cf393a71a0b67b2539531 with SHA1 0bbb2ed53e is in history

Change-Id: Iecbf40ae565dea3f2831cd5faee29690f8ec3724
2019-07-16 18:55:30 -07:00
Tao Bao e64e670fab [automerger skipped] minadbd sends heartbeat to rescue service for getprop command.
am: dd0158ac60 -s ours
am skip reason: change_id Ib9d5ed710cfa94ecfe6cf393a71a0b67b2539531 with SHA1 2223e6a9f8 is in history

Change-Id: I672a987e18b370b2a21d3f39e088b57079a40dab
2019-07-16 18:46:29 -07:00
Tao Bao ac6652d37d [automerger skipped] minadbd sends heartbeat to rescue service for getprop command.
am: dd0158ac60 -s ours
am skip reason: change_id Ib9d5ed710cfa94ecfe6cf393a71a0b67b2539531 with SHA1 0bbb2ed53e is in history

Change-Id: I02a82fc0d026e06eadbadd6af0af85228ce2e044
2019-07-16 18:46:29 -07:00
Tianjie Xu 7efd23338a Add command line parser for simulator
Add a command line parser. Also add the support to parse the oem
property file and skip certain functions.

Bug: 131911365
Test: run simulator for wear builds
Change-Id: Ide306b53d3f42b29c02279969aeb18bec4045d6f
2019-07-16 13:03:41 -07:00
Tao Bao dd0158ac60 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)
(cherry picked from commit 0bbb2ed53e)
2019-07-16 15:28:03 +00:00
Tianjie Xu 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 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 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 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 fc2ad88770 Merge "Drop the device specific support for update host simulator" 2019-07-14 22:49:59 +00:00
David Anderson 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 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 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 d3d51e5066 Merge "Fix build for API change to DestroyLogicalPartition()."
am: 4c8e6eae28

Change-Id: Ifdc9b9560114d89c53ba99e5dc360769e157cdab
2019-07-13 11:18:02 -07:00
David Anderson 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 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 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 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 04708fe48e Merge "Remove libimgpatch" am: ed96da6664 am: 36385bd9ee
am: be4712aabd

Change-Id: Iea6726eeaf2651c848dc4f4a64d05bc51e8bd389
2019-07-10 18:41:39 -07:00
Tianjie Xu be4712aabd Merge "Remove libimgpatch" am: ed96da6664
am: 36385bd9ee

Change-Id: I8ed0f92329550c4b643e8f52ad8471bce1e79769
2019-07-10 18:26:47 -07:00
Tianjie Xu 36385bd9ee Merge "Remove libimgpatch"
am: ed96da6664

Change-Id: Id263dad2ce56b5268af5e65ee8d1cc55d2967e56
2019-07-10 18:04:27 -07:00
Treehugger Robot ed96da6664 Merge "Remove libimgpatch" 2019-07-11 00:38:02 +00:00
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