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

am 29c6f24b: am 6ffe2594: Merge "restorecon /data/anr directory."

Browse Source 
* commit '29c6f24b254b4ea1a7d8448980e736355e4badf6':
  restorecon /data/anr directory.
This commit is contained in:
Jean-Baptiste Queru
2012-08-22 07:49:03 -07:00
committed by Android Git Automerger
parent 00a8f4ff62 29c6f24b25
commit 2bd65b61ba
2 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
services/java/com/android/server/am/ActivityManagerService.java
View File

@@ -105,6 +105,7 @@ import android.os.ParcelFileDescriptor;
import android.os.Process;
import android.os.RemoteCallbackList;
import android.os.RemoteException;
import android.os.SELinux;
import android.os.ServiceManager;
import android.os.StrictMode;
import android.os.SystemClock;
@@ -3040,7 +3041,12 @@ public final class ActivityManagerService extends ActivityManagerNative
File tracesFile = new File(tracesPath);
try {
File tracesDir = tracesFile.getParentFile();
if (!tracesDir.exists()) tracesFile.mkdirs();
if (!tracesDir.exists()) {
tracesFile.mkdirs();
if (!SELinux.restorecon(tracesDir)) {
return null;
}
}
FileUtils.setPermissions(tracesDir.getPath(), 0775, -1, -1); // drwxrwxr-x
if (clearTraces && tracesFile.exists()) tracesFile.delete();
@@ -3144,7 +3150,12 @@ public final class ActivityManagerService extends ActivityManagerNative
final File tracesDir = tracesFile.getParentFile();
final File tracesTmp = new File(tracesDir, "__tmp__");
try {
if (!tracesDir.exists()) tracesFile.mkdirs();
if (!tracesDir.exists()) {
tracesFile.mkdirs();
if (!SELinux.restorecon(tracesDir.getPath())) {
return;
}
}
FileUtils.setPermissions(tracesDir.getPath(), 0775, -1, -1); // drwxrwxr-x
if (tracesFile.exists()) {

4
services/java/com/android/server/am/DeviceMonitor.java
View File

@@ -16,6 +16,7 @@
package com.android.server.am;
import android.os.SELinux;
import android.util.Slog;
import java.io.*;
@@ -80,6 +81,9 @@ class DeviceMonitor {
if (!BASE.isDirectory() && !BASE.mkdirs()) {
throw new AssertionError("Couldn't create " + BASE + ".");
}
if (!SELinux.restorecon(BASE)) {
throw new AssertionError("Couldn't restorecon " + BASE + ".");
}
}
private static final File[] PATHS = {