PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

get rid of console thread for OpenRecoveryScript

Browse Source 
- CLI commands run in a threaded action "twcmd"
- Console is displayed via "singleaction_page"
- move ORS execution code from GUI action to OpenRecoveryScript class
- remove unused function gui_changePackage
- don't change PageManager package in home action
- fix that /tmp/openrecoveryscript was not deleted after execution

Change-Id: Ic688c0b04647ce09e9db979b0bc5123f47cf4f70
This commit is contained in:
that
2015-12-29 15:39:57 -06:00
committed by Ethan Yonker
parent 0af1ac13d1
commit 10ae24ff94
8 changed files with 144 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gui/action.cpp
+13 -31
View File
@@ -226,6 +226,7 @@ GUIAction::GUIAction(xml_node<>* node)
ADD_ACTION(resize);
ADD_ACTION(changefilesystem);
ADD_ACTION(flashimage);
ADD_ACTION(twcmd);
}
// First, get the action
@@ -522,7 +523,6 @@ int GUIAction::reboot(std::string arg)
int GUIAction::home(std::string arg __unused)
{
PageManager::SelectPackage("TWRP");
gui_changePage("main");
return 0;
}
@@ -1536,41 +1536,12 @@ int GUIAction::adbsideloadcancel(std::string arg __unused)
int GUIAction::openrecoveryscript(std::string arg __unused)
{
int op_status = 1;
operation_start("OpenRecoveryScript");
if (simulate) {
simulate_progress_bar();
operation_end(0);
} else {
// Check for the SCRIPT_FILE_TMP first as these are AOSP recovery commands
// that we converted to ORS commands during boot in recovery.cpp.
// Run those first.
int reboot = 0;
if (TWFunc::Path_Exists(SCRIPT_FILE_TMP)) {
gui_msg("running_recovery_commands=Running Recovery Commands");
if (OpenRecoveryScript::run_script_file() == 0) {
reboot = 1;
op_status = 0;
}
}
// Check for the ORS file in /cache and attempt to run those commands.
if (OpenRecoveryScript::check_for_script_file()) {
gui_msg("running_ors=Running OpenRecoveryScript");
if (OpenRecoveryScript::run_script_file() == 0) {
reboot = 1;
op_status = 0;
}
}
if (reboot) {
// Disable stock recovery reflashing
TWFunc::Disable_Stock_Recovery_Replace();
usleep(2000000); // Sleep for 2 seconds before rebooting
TWFunc::tw_reboot(rb_system);
usleep(5000000); // Sleep for 5 seconds to allow reboot to occur
} else {
DataManager::SetValue("tw_page_done", 1);
}
int op_status = OpenRecoveryScript::Run_OpenRecoveryScript_Action();
operation_end(op_status);
}
return 0;
@@ -1743,6 +1714,17 @@ int GUIAction::flashimage(std::string arg __unused)
return 0;
}
int GUIAction::twcmd(std::string arg)
{
operation_start("TWRP CLI Command");
if (simulate)
simulate_progress_bar();
else
OpenRecoveryScript::Run_CLI_Command(arg.c_str());
operation_end(0);
return 0;
}
int GUIAction::getKeyByName(std::string key)
{
if (key == "home") return KEY_HOME;