diff options
| author | Dianne Hackborn <hackbod@google.com> | 2011-03-15 14:40:56 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-03-15 14:40:56 -0700 |
| commit | 7c2e76f0a4daa7e4316e7a85d41d3c391319d955 (patch) | |
| tree | a18cc914dfc7494766b492b545cec39c81b31896 /services | |
| parent | b09763209980ff9210cc353f2410598220ec0480 (diff) | |
| parent | 1ab43775d8134d652a7d27f2d79c569653e47f1a (diff) | |
| download | frameworks_base-7c2e76f0a4daa7e4316e7a85d41d3c391319d955.zip frameworks_base-7c2e76f0a4daa7e4316e7a85d41d3c391319d955.tar.gz frameworks_base-7c2e76f0a4daa7e4316e7a85d41d3c391319d955.tar.bz2 | |
Merge "Improve error reporting for issue #3183612" into gingerbread
Diffstat (limited to 'services')
| -rwxr-xr-x | services/java/com/android/server/am/ActivityManagerService.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/services/java/com/android/server/am/ActivityManagerService.java b/services/java/com/android/server/am/ActivityManagerService.java index ddd99f4..d004034 100755 --- a/services/java/com/android/server/am/ActivityManagerService.java +++ b/services/java/com/android/server/am/ActivityManagerService.java @@ -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 { |