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

Merge "Fix issue #11069176: Crash showing process stats" into klp-dev

Browse Source
This commit is contained in:
Dianne Hackborn
2013-10-04 16:49:04 +00:00
committed by Android (Google) Code Review
parent 5c126892ec d94d533b5a
commit 2d94c57345
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -97,6 +97,19 @@ public final class ProcessStatsService extends IProcessStats.Stub {
});
}
@Override
public boolean onTransact(int code, Parcel data, Parcel reply, int flags)
throws RemoteException {
try {
return super.onTransact(code, data, reply, flags);
} catch (RuntimeException e) {
if (!(e instanceof SecurityException)) {
Slog.wtf(TAG, "Process Stats Crash", e);
}
throw e;
}
}
public ProcessStats.ProcessState getProcessStateLocked(String packageName,
int uid, String processName) {
return mProcessStats.getProcessStateLocked(packageName, uid, processName);
@@ -477,7 +490,7 @@ public final class ProcessStatsService extends IProcessStats.Stub {
- moreStats.mTimePeriodStartRealtime, sb);
Slog.i(TAG, sb.toString());
} else {
Slog.w(TAG, "Failure reading " + files.get(i) + "; "
Slog.w(TAG, "Failure reading " + files.get(i-1) + "; "
+ moreStats.mReadError);
continue;
}