summaryrefslogtreecommitdiffstats
path: root/adb
diff options
context:
space:
mode:
authorNick Kralevich <nnk@google.com>2014-03-07 02:29:38 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-07 02:29:38 +0000
commit6e94c5764b1775a0e4f122cf3925c46815029ccb (patch)
tree29ad445e86e8a60d42b6534f2146e578f0fe7eb1 /adb
parenta8a427d1803c4cd99e4c125a5bd8c1e093d4c546 (diff)
parent2e7347d617b02b13d227bb4cecf6bd69b7b20fa9 (diff)
downloadsystem_core-6e94c5764b1775a0e4f122cf3925c46815029ccb.tar.gz
system_core-6e94c5764b1775a0e4f122cf3925c46815029ccb.tar.bz2
system_core-6e94c5764b1775a0e4f122cf3925c46815029ccb.zip
am 2e7347d6: Merge "Convert all selinux_android_restorecon and _setfilecon calls to new API."
* commit '2e7347d617b02b13d227bb4cecf6bd69b7b20fa9': Convert all selinux_android_restorecon and _setfilecon calls to new API.
Diffstat (limited to 'adb')
-rw-r--r--adb/file_sync_service.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/adb/file_sync_service.c b/adb/file_sync_service.c
index 577fb8f73..e981c2a50 100644
--- a/adb/file_sync_service.c
+++ b/adb/file_sync_service.c
@@ -68,7 +68,7 @@ static int mkdirs(char *name)
*x = '/';
return ret;
}
- selinux_android_restorecon(name);
+ selinux_android_restorecon(name, 0);
}
*x++ = '/';
}
@@ -246,7 +246,7 @@ static int handle_send_file(int s, char *path, uid_t uid,
if(fd >= 0) {
struct utimbuf u;
adb_close(fd);
- selinux_android_restorecon(path);
+ selinux_android_restorecon(path, 0);
u.actime = timestamp;
u.modtime = timestamp;
utime(path, &u);