am 2d91368a: am 2d94c573: Merge "Fix issue #11069176: Crash showing process stats" into klp-dev

* commit '2d91368aea75dbc195d07efc465a462a006a5753':
  Fix issue #11069176: Crash showing process stats

1 files changed, 14 insertions, 1 deletions

diff --git a/services/java/com/android/server/am/ProcessStatsService.java b/services/java/com/android/server/am/ProcessStatsService.java
index 7dc006c..dbc05fa 100644
--- a/services/java/com/android/server/am/ProcessStatsService.java
+++ b/services/java/com/android/server/am/ProcessStatsService.java
@@ -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;
                         }