diff options
author | Dianne Hackborn <hackbod@google.com> | 2013-08-05 18:18:42 -0700 |
---|---|---|
committer | Dianne Hackborn <hackbod@google.com> | 2013-08-06 13:54:07 -0700 |
commit | d2932243e3313b59e7538641731aa98852bc5ac7 (patch) | |
tree | d2ccb55820c8c47c535f7b973087cd3446f308b6 /core/java/android | |
parent | 03901667db75696ccd544809e0e7bc000a99f417 (diff) | |
download | frameworks_base-d2932243e3313b59e7538641731aa98852bc5ac7.zip frameworks_base-d2932243e3313b59e7538641731aa98852bc5ac7.tar.gz frameworks_base-d2932243e3313b59e7538641731aa98852bc5ac7.tar.bz2 |
Refactor ProcessStats, ProcessTracker.
ProcessStats is now called ProcessCpuTracker.
ProcessTracker is now ProcessStatsService, and its inner State
class is broken out into a separate top-level ProcessStats class.
This ProcessStats is moved to the framework, so we will be able
to use it elsewhere.
Change-Id: I6a127bcb835b6b474b72647c0b99b82c2137e5c5
Diffstat (limited to 'core/java/android')
-rw-r--r-- | core/java/android/os/Binder.java | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/core/java/android/os/Binder.java b/core/java/android/os/Binder.java index 7b91418..4627c88 100644 --- a/core/java/android/os/Binder.java +++ b/core/java/android/os/Binder.java @@ -296,7 +296,21 @@ public class Binder implements IBinder { disabled = sDumpDisabled; } if (disabled == null) { - dump(fd, pw, args); + try { + dump(fd, pw, args); + } catch (SecurityException e) { + pw.println(); + pw.println("Security exception: " + e.getMessage()); + throw e; + } catch (Throwable e) { + // Unlike usual calls, in this case if an exception gets thrown + // back to us we want to print it back in to the dump data, since + // that is where the caller expects all interesting information to + // go. + pw.println(); + pw.println("Exception occurred while dumping:"); + e.printStackTrace(pw); + } } else { pw.println(sDumpDisabled); } @@ -443,7 +457,6 @@ final class BinderProxy implements IBinder { data.writeStringArray(args); try { transact(DUMP_TRANSACTION, data, reply, FLAG_ONEWAY); - reply.readException(); } finally { data.recycle(); reply.recycle(); |