diff options
| author | Dianne Hackborn <hackbod@google.com> | 2011-03-15 14:49:45 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-15 14:49:45 -0700 |
| commit | e2e8da7c734b71c4b6b81e51e16ce3f4061f0f07 (patch) | |
| tree | b48509a9d3841a878786f7ba15a636cb7bd87ecd | |
| parent | 3c9aa1aa093ff8acc5ec71190a35b9ab04d64fda (diff) | |
| parent | 7c2e76f0a4daa7e4316e7a85d41d3c391319d955 (diff) | |
| download | frameworks_base-e2e8da7c734b71c4b6b81e51e16ce3f4061f0f07.zip frameworks_base-e2e8da7c734b71c4b6b81e51e16ce3f4061f0f07.tar.gz frameworks_base-e2e8da7c734b71c4b6b81e51e16ce3f4061f0f07.tar.bz2 | |
am 7c2e76f0: Merge "Improve error reporting for issue #3183612" into gingerbread
* commit '7c2e76f0a4daa7e4316e7a85d41d3c391319d955':
Improve error reporting for issue #3183612
| -rw-r--r-- | core/java/android/os/Looper.java | 3 | ||||
| -rwxr-xr-x | services/java/com/android/server/am/ActivityManagerService.java | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/core/java/android/os/Looper.java b/core/java/android/os/Looper.java index 994c242..2a66616 100644 --- a/core/java/android/os/Looper.java +++ b/core/java/android/os/Looper.java @@ -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(); diff --git a/services/java/com/android/server/am/ActivityManagerService.java b/services/java/com/android/server/am/ActivityManagerService.java index 0e38e10..883fdda 100755 --- a/services/java/com/android/server/am/ActivityManagerService.java +++ b/services/java/com/android/server/am/ActivityManagerService.java @@ -6694,8 +6694,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 { |