Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Don't set sehash when calling restoreconRecursive" into qt-dev

Browse Source 
am: 4ef3e8a309

Change-Id: I99389ec57025f106e0eee52b7ceee78d17b8c864
This commit is contained in:
Nick Kralevich
2019-04-05 13:32:36 -07:00
committed by android-build-merger
parent d717015856 4ef3e8a309
commit 83c282af83
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/os/SELinux.java
View File

@@ -31,12 +31,15 @@ import java.io.IOException;
public class SELinux {
private static final String TAG = "SELinux";
/** Keep in sync with ./external/libselinux/include/selinux/android.h */
/** Keep in sync with ./external/selinux/libselinux/include/selinux/android.h */
private static final int SELINUX_ANDROID_RESTORECON_NOCHANGE = 1;
private static final int SELINUX_ANDROID_RESTORECON_VERBOSE = 2;
private static final int SELINUX_ANDROID_RESTORECON_RECURSE = 4;
private static final int SELINUX_ANDROID_RESTORECON_FORCE = 8;
private static final int SELINUX_ANDROID_RESTORECON_DATADATA = 16;
private static final int SELINUX_ANDROID_RESTORECON_SKIPCE = 32;
private static final int SELINUX_ANDROID_RESTORECON_CROSS_FILESYSTEMS = 64;
private static final int SELINUX_ANDROID_RESTORECON_SKIP_SEHASH = 128;
/**
* Get context associated with path by file_contexts.
@@ -182,7 +185,8 @@ public class SELinux {
@UnsupportedAppUsage
public static boolean restoreconRecursive(File file) {
try {
return native_restorecon(file.getCanonicalPath(), SELINUX_ANDROID_RESTORECON_RECURSE);
return native_restorecon(file.getCanonicalPath(),
SELINUX_ANDROID_RESTORECON_RECURSE | SELINUX_ANDROID_RESTORECON_SKIP_SEHASH);
} catch (IOException e) {
Slog.e(TAG, "Error getting canonical path. Restorecon failed for " +
file.getPath(), e);