summaryrefslogtreecommitdiffstats
path: root/services/java
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2014-10-01 14:59:58 -0700
committerDianne Hackborn <hackbod@google.com>2014-10-01 16:58:56 -0700
commit8d05172112436a81bed6e4a0810f8914509d8a4d (patch)
tree6436496aef38ce21c06c6d073fd28edcea204ba3 /services/java
parentf178591f26a535ec3cffa3520c3ca387ec44959b (diff)
downloadframeworks_base-8d05172112436a81bed6e4a0810f8914509d8a4d.zip
frameworks_base-8d05172112436a81bed6e4a0810f8914509d8a4d.tar.gz
frameworks_base-8d05172112436a81bed6e4a0810f8914509d8a4d.tar.bz2
More work on issue #17656716: Unhandled exception in Window Manager
Fix Slog.wtf to not acquire the activity manager lock in its code path, so that it can never deadlock. This was the original intention of it, but part was missed. Now we can put back in the code to detect when strict mode data is getting large (a little more targeted now to the actual problem), and use Slog.wtf to report it. And as a bonus, when this happens we will now clear all of the collected violations, to avoid getting in to the bad case where IPCs start failing. So this should be good enough for L to fix the problem, with wtf reports for us to see if the underlying issue is still happening. Finally, switch a butch of stuff in the system process from Log.wtf to Slog.wtf, since many of those are deadlocks waiting to happen. Oh and fix a crash in the settings provider I noticed in APR. Change-Id: I307d51b7a4db238fd1e5fe2f3f9bf1b9c6f1c041
Diffstat (limited to 'services/java')
-rw-r--r--services/java/com/android/server/SystemServer.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java
index f339dba..92ad1ad 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -272,7 +272,7 @@ public final class SystemServer {
private void reportWtf(String msg, Throwable e) {
Slog.w(TAG, "***********************************************");
- Log.wtf(TAG, "BOOT FAILURE " + msg, e);
+ Slog.wtf(TAG, "BOOT FAILURE " + msg, e);
}
private void performPendingShutdown() {