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

am 1a4b8288: Merge "Change wtf errors from ASSERT to ERROR." into mnc-dev

Browse Source 
* commit '1a4b8288ad525ec9e951010151e4ed91bd514043':
  Change wtf errors from ASSERT to ERROR.
This commit is contained in:
Christopher Ferris
2015-06-10 00:38:44 +00:00
committed by Android Git Automerger
parent e6581b11a9 1a4b8288ad
commit 0a77826257
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/util/Log.java
View File

@@ -289,7 +289,10 @@ public final class Log {
static int wtf(int logId, String tag, String msg, Throwable tr, boolean localStack,
boolean system) {
TerribleFailure what = new TerribleFailure(msg, tr);
int bytes = println_native(logId, ASSERT, tag, msg + '\n'
// Only mark this as ERROR, do not use ASSERT since that should be
// reserved for cases where the system is guaranteed to abort.
// The onTerribleFailure call does not always cause a crash.
int bytes = println_native(logId, ERROR, tag, msg + '\n'
+ getStackTraceString(localStack ? what : tr));
sWtfHandler.onTerribleFailure(tag, what, system);
return bytes;