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

Fix compile error on 4.4 tree

Browse Source 
Change-Id: Id85fdf0f4dee02f8ee3ae50ec42423c6a154a3eb
This commit is contained in:
Ethan Yonker
2017-01-11 10:45:04 -06:00
parent f2e3f0c51c
commit 4767caf1f4
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gui/action.cpp
+6 -6
View File
@@ -1918,7 +1918,7 @@ int GUIAction::checkforapp(std::string arg __unused)
string parent_path = "/data/app";
DIR *d = opendir("/data/app");
struct dirent *p;
int len = strlen("me.twrp.twrpapp-");
size_t len = strlen("me.twrp.twrpapp-");
while ((p = readdir(d))) {
if (!strcmp(p->d_name, ".") || !strcmp(p->d_name, ".."))
continue;
@@ -1959,7 +1959,7 @@ int GUIAction::installapp(std::string arg __unused)
LOGERR("chown %s error: %s\n", install_path.c_str(), strerror(errno));
goto exit;
}
if (setfilecon(install_path.c_str(), context.c_str()) < 0) {
if (setfilecon(install_path.c_str(), (security_context_t)context.c_str()) < 0) {
LOGERR("setfilecon %s error: %s\n", install_path.c_str(), strerror(errno));
goto exit;
}
@@ -1973,7 +1973,7 @@ int GUIAction::installapp(std::string arg __unused)
LOGERR("chown %s error: %s\n", install_path.c_str(), strerror(errno));
goto exit;
}
if (setfilecon(install_path.c_str(), context.c_str()) < 0) {
if (setfilecon(install_path.c_str(), (security_context_t)context.c_str()) < 0) {
LOGERR("setfilecon %s error: %s\n", install_path.c_str(), strerror(errno));
goto exit;
}
@@ -1986,7 +1986,7 @@ int GUIAction::installapp(std::string arg __unused)
LOGERR("chown %s error: %s\n", install_path.c_str(), strerror(errno));
goto exit;
}
if (setfilecon(install_path.c_str(), context.c_str()) < 0) {
if (setfilecon(install_path.c_str(), (security_context_t)context.c_str()) < 0) {
LOGERR("setfilecon %s error: %s\n", install_path.c_str(), strerror(errno));
goto exit;
}
@@ -2006,7 +2006,7 @@ int GUIAction::installapp(std::string arg __unused)
install_path += "/twrpapp";
LOGINFO("Installing app to '%s'\n", install_path.c_str());
if (mkdir(install_path.c_str(), S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH) == 0) {
if (setfilecon(install_path.c_str(), context.c_str()) < 0) {
if (setfilecon(install_path.c_str(), (security_context_t)context.c_str()) < 0) {
LOGERR("setfilecon %s error: %s\n", install_path.c_str(), strerror(errno));
goto exit;
}
@@ -2015,7 +2015,7 @@ int GUIAction::installapp(std::string arg __unused)
LOGERR("Error copying apk file\n");
goto exit;
}
if (setfilecon(install_path.c_str(), context.c_str()) < 0) {
if (setfilecon(install_path.c_str(), (security_context_t)context.c_str()) < 0) {
LOGERR("setfilecon %s error: %s\n", install_path.c_str(), strerror(errno));
goto exit;
}