drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Improve error reporting for issue #3183612" into gingerbread

Browse Source
This commit is contained in:
Dianne Hackborn
2011-03-15 14:40:56 -07:00
committed by Android (Google) Code Review
parent b097632099 1ab43775d8
commit 7c2e76f0a4
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/os/Looper.java
View File

@ -139,7 +139,8 @@ public class Looper {
Log.wtf("Looper", "Thread identity changed from 0x"
+ Long.toHexString(ident) + " to 0x"
+ Long.toHexString(newIdent) + " while dispatching to "
+ msg.target + " " + msg.callback + " what=" + msg.what);
+ msg.target.getClass().getName() + " "
+ msg.callback + " what=" + msg.what);
}
msg.recycle();

5
services/java/com/android/server/am/ActivityManagerService.java
View File

@ -6667,8 +6667,9 @@ public final class ActivityManagerService extends ActivityManagerNative
addErrorToDropBox("wtf", r, null, null, tag, null, null, crashInfo);
if (Settings.Secure.getInt(mContext.getContentResolver(),
Settings.Secure.WTF_IS_FATAL, 0) != 0) {
if (r != null && r.pid != Process.myPid() &&
Settings.Secure.getInt(mContext.getContentResolver(),
Settings.Secure.WTF_IS_FATAL, 0) != 0) {
crashApplication(r, crashInfo);
return true;
} else {