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

am d2165cfc: Merge "StrictMode: time violations in Binder calls" into gingerbread

Browse Source 
Merge commit 'd2165cfce7911dac66d1195ed9123e79b086d22b' into gingerbread-plus-aosp

* commit 'd2165cfce7911dac66d1195ed9123e79b086d22b':
  StrictMode: time violations in Binder calls
This commit is contained in:
Brad Fitzpatrick
2010-07-30 15:23:19 -07:00
committed by Android Git Automerger
parent 7600f93401 d2165cfce7
commit e2d33bbc49
5 changed files with 250 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6125,17 +6125,19 @@ public final class ActivityManagerService extends ActivityManagerNative implemen
}
public void handleApplicationStrictModeViolation(
IBinder app, int violationMask, ApplicationErrorReport.CrashInfo crashInfo) {
IBinder app,
int violationMask,
StrictMode.ViolationInfo info) {
ProcessRecord r = findAppProcess(app);
if ((violationMask & StrictMode.PENALTY_DROPBOX) != 0) {
Integer stackFingerprint = crashInfo.stackTrace.hashCode();
Integer stackFingerprint = info.crashInfo.stackTrace.hashCode();
boolean logIt = true;
synchronized (mAlreadyLoggedViolatedStacks) {
if (mAlreadyLoggedViolatedStacks.contains(stackFingerprint)) {
logIt = false;
// TODO: sub-sample into EventLog for these, with
// the crashInfo.durationMillis? Then we'd get
// the info.durationMillis? Then we'd get
// the relative pain numbers, without logging all
// the stack traces repeatedly. We'd want to do
// likewise in the client code, which also does
@@ -6148,7 +6150,7 @@ public final class ActivityManagerService extends ActivityManagerNative implemen
}
}
if (logIt) {
logStrictModeViolationToDropBox(r, crashInfo);
logStrictModeViolationToDropBox(r, info);
}
}
@@ -6163,7 +6165,7 @@ public final class ActivityManagerService extends ActivityManagerNative implemen
data.put("result", result);
data.put("app", r);
data.put("violationMask", violationMask);
data.put("crashInfo", crashInfo);
data.put("info", info);
msg.obj = data;
mHandler.sendMessage(msg);
@@ -6178,9 +6180,10 @@ public final class ActivityManagerService extends ActivityManagerNative implemen
// these in quick succession so we try to batch these together to
// minimize disk writes, number of dropbox entries, and maximize
// compression, by having more fewer, larger records.
private void logStrictModeViolationToDropBox(ProcessRecord process,
ApplicationErrorReport.CrashInfo crashInfo) {
if (crashInfo == null) {
private void logStrictModeViolationToDropBox(
ProcessRecord process,
StrictMode.ViolationInfo info) {
if (info == null) {
return;
}
final boolean isSystemApp = process == null ||
@@ -6201,12 +6204,16 @@ public final class ActivityManagerService extends ActivityManagerNative implemen
appendDropBoxProcessHeaders(process, sb);
sb.append("Build: ").append(Build.FINGERPRINT).append("\n");
sb.append("System-App: ").append(isSystemApp).append("\n");
if (crashInfo != null && crashInfo.durationMillis != -1) {
sb.append("Duration-Millis: ").append(crashInfo.durationMillis).append("\n");
sb.append("Uptime-Millis: ").append(info.violationUptimeMillis).append("\n");
if (info.violationNumThisLoop != 0) {
sb.append("Loop-Violation-Number: ").append(info.violationNumThisLoop).append("\n");
}
if (info != null && info.durationMillis != -1) {
sb.append("Duration-Millis: ").append(info.durationMillis).append("\n");
}
sb.append("\n");
if (crashInfo != null && crashInfo.stackTrace != null) {
sb.append(crashInfo.stackTrace);
if (info.crashInfo != null && info.crashInfo.stackTrace != null) {
sb.append(info.crashInfo.stackTrace);
}
sb.append("\n");