Revert " Fixes for #1024 , #1018 #1064 "

This commit is contained in:
orignal 2018-01-22 12:59:34 -05:00 committed by GitHub
parent b8fd9ba83f
commit 626ed720a6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 57 additions and 208 deletions

View file

@ -126,11 +126,12 @@ namespace android
}
*/
static DaemonAndroidImpl daemon;
static char* argv[1]={strdup("tmp")};
/**
* returns error details if failed
* returns "ok" if daemon initialized and started okay
*/
std::string start(int argc, char* argv[])
std::string start(/*int argc, char* argv[]*/)
{
try
{
@ -138,7 +139,7 @@ namespace android
{
//Log.d(TAG"Initialising the daemon...");
bool daemonInitSuccess = daemon.init(argc,argv);
bool daemonInitSuccess = daemon.init(1,argv);
if(!daemonInitSuccess)
{
//QMessageBox::critical(0, "Error", "Daemon init failed");