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

Merge "restorecon /data/anr directory."

Browse Source
This commit is contained in:
Jean-Baptiste Queru
2012-08-22 07:18:39 -07:00
committed by android code review
parent b0b4a70440 ec7ed14c18
commit 6ffe259467
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

@@ -106,6 +106,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;
@@ -3032,7 +3033,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();
@@ -3136,7 +3142,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 = {