diff options
| author | Dianne Hackborn <hackbod@google.com> | 2011-03-15 15:47:32 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-15 15:47:32 -0700 |
| commit | fd865d0fb5f5b38a41a9196ee54357715bd32254 (patch) | |
| tree | 93b61e2e6866c793d7430edada96beea698cbd02 /services | |
| parent | 05672d59a72b31341249e0470305b99236e6cd99 (diff) | |
| parent | 9b7c1274ddba8db2842431649d46c4cef510131f (diff) | |
| download | frameworks_base-fd865d0fb5f5b38a41a9196ee54357715bd32254.zip frameworks_base-fd865d0fb5f5b38a41a9196ee54357715bd32254.tar.gz frameworks_base-fd865d0fb5f5b38a41a9196ee54357715bd32254.tar.bz2 | |
am 9b7c1274: am e2e8da7c: am 7c2e76f0: Merge "Improve error reporting for issue #3183612" into gingerbread
* commit '9b7c1274ddba8db2842431649d46c4cef510131f':
Improve error reporting for issue #3183612
Diffstat (limited to 'services')
| -rw-r--r-- | 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 267c76a..50fffd0 100644 --- a/services/java/com/android/server/am/ActivityManagerService.java +++ b/services/java/com/android/server/am/ActivityManagerService.java @@ -6996,8 +6996,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 { |