summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNick Kralevich <nnk@google.com>2014-02-12 23:19:05 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-02-12 23:19:05 +0000
commit20b5fd98fb9c80ed29d57d67eb706a36b02708da (patch)
treefabcc5b06a12f479cbfda74c08039bb5ae929217
parent34cc9f9056e8736143e82891ccd01a85106a4518 (diff)
parent93994e9db44a30402bd596764163d81ee1b1fd30 (diff)
downloadframeworks_base-20b5fd98fb9c80ed29d57d67eb706a36b02708da.zip
frameworks_base-20b5fd98fb9c80ed29d57d67eb706a36b02708da.tar.gz
frameworks_base-20b5fd98fb9c80ed29d57d67eb706a36b02708da.tar.bz2
am 93994e9d: am a9bb594d: Merge "Convert all selinux_android_restorecon and _setfilecon calls to new API."
* commit '93994e9db44a30402bd596764163d81ee1b1fd30': Convert all selinux_android_restorecon and _setfilecon calls to new API.
-rw-r--r--core/jni/android_os_SELinux.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/jni/android_os_SELinux.cpp b/core/jni/android_os_SELinux.cpp
index db84d00..26405b5 100644
--- a/core/jni/android_os_SELinux.cpp
+++ b/core/jni/android_os_SELinux.cpp
@@ -415,7 +415,7 @@ static jboolean native_restorecon(JNIEnv *env, jobject, jstring pathnameStr) {
return false;
}
- int ret = selinux_android_restorecon(pathname.c_str());
+ int ret = selinux_android_restorecon(pathname.c_str(), 0);
ALOGV("restorecon(%s) => %d", pathname.c_str(), ret);
return (ret == 0);
}