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"

Browse Source
This commit is contained in:
Treehugger Robot
2019-04-05 15:25:47 +00:00
committed by Gerrit Code Review
parent 5b3a0d18ae cb1dddad27
commit 5721cf94de
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 { public class SELinux {
private static final String TAG = "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_NOCHANGE = 1;
private static final int SELINUX_ANDROID_RESTORECON_VERBOSE = 2; 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_RECURSE = 4;
private static final int SELINUX_ANDROID_RESTORECON_FORCE = 8; 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_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;
/** /**
* Determine whether SELinux is disabled or enabled. * Determine whether SELinux is disabled or enabled.
@@ -175,7 +178,8 @@ public class SELinux {
@UnsupportedAppUsage @UnsupportedAppUsage
public static boolean restoreconRecursive(File file) { public static boolean restoreconRecursive(File file) {
try { 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) { } catch (IOException e) {
Slog.e(TAG, "Error getting canonical path. Restorecon failed for " + Slog.e(TAG, "Error getting canonical path. Restorecon failed for " +
file.getPath(), e); file.getPath(), e);