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

am a5a0de9f: am b6634304: Merge "Remove setEnforcingMode from SELinuxPolicyInstallReceiver."

Browse Source 
* commit 'a5a0de9f2943c6188bd5855adfe4c5da7a985d2d':
  Remove setEnforcingMode from SELinuxPolicyInstallReceiver.
This commit is contained in:
Nick Kralevich
2013-12-02 20:12:55 +00:00
committed by Android Git Automerger
parent 6415d688e0 a5a0de9f29
commit 18c2736cf0
1 changed files with 0 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
services/java/com/android/server/updates/SELinuxPolicyInstallReceiver.java
View File

@@ -125,25 +125,11 @@ public class SELinuxPolicyInstallReceiver extends ConfigUpdateInstallReceiver {
SystemProperties.set("selinux.reload_policy", "1");
}
private void setEnforcingMode(Context context) {
String mode = Settings.Global.getString(context.getContentResolver(),
Settings.Global.SELINUX_STATUS);
if ("1".equals(mode)) {
Slog.i(TAG, "Setting enforcing mode");
SystemProperties.set("persist.selinux.enforcing", mode);
} else if ("0".equals(mode)) {
Slog.i(TAG, "Tried to set permissive mode, ignoring");
} else {
Slog.e(TAG, "Got invalid enforcing mode: " + mode);
}
}
@Override
protected void postInstall(Context context, Intent intent) {
try {
unpackBundle();
applyUpdate();
setEnforcingMode(context);
} catch (IllegalArgumentException e) {
Slog.e(TAG, "SELinux policy update malformed: ", e);
} catch (IOException e) {