diff options
author | Conley Owens <cco3@android.com> | 2011-04-29 09:59:22 -0700 |
---|---|---|
committer | Android Code Review <code-review@android.com> | 2011-04-29 09:59:22 -0700 |
commit | 03daee6380772b0ab167a7b28e37d7a21ec89c86 (patch) | |
tree | 8b28f2d92291322c49c33321128f733264b84c3d | |
parent | 2f463ef18bb235be57b39cbda536bcd2df2d0908 (diff) | |
parent | 68a4e0a38fca00e9615a3c8ccb2d46edc88cf338 (diff) | |
download | frameworks_base-03daee6380772b0ab167a7b28e37d7a21ec89c86.zip frameworks_base-03daee6380772b0ab167a7b28e37d7a21ec89c86.tar.gz frameworks_base-03daee6380772b0ab167a7b28e37d7a21ec89c86.tar.bz2 |
Merge "frameworks/base: acquire lock on am only when needed"
-rw-r--r--[-rwxr-xr-x] | services/java/com/android/server/am/ActivityManagerService.java | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/services/java/com/android/server/am/ActivityManagerService.java b/services/java/com/android/server/am/ActivityManagerService.java index 883fdda..d24ce7e 100755..100644 --- a/services/java/com/android/server/am/ActivityManagerService.java +++ b/services/java/com/android/server/am/ActivityManagerService.java @@ -6734,18 +6734,25 @@ public final class ActivityManagerService extends ActivityManagerNative * to append various headers to the dropbox log text. */ private void appendDropBoxProcessHeaders(ProcessRecord process, StringBuilder sb) { + // Watchdog thread ends up invoking this function (with + // a null ProcessRecord) to add the stack file to dropbox. + // Do not acquire a lock on this (am) in such cases, as it + // could cause a potential deadlock, if and when watchdog + // is invoked due to unavailability of lock on am and it + // would prevent watchdog from killing system_server. + if (process == null) { + sb.append("Process: system_server\n"); + return; + } // Note: ProcessRecord 'process' is guarded by the service // instance. (notably process.pkgList, which could otherwise change // concurrently during execution of this method) synchronized (this) { - if (process == null || process.pid == MY_PID) { + if (process.pid == MY_PID) { sb.append("Process: system_server\n"); } else { sb.append("Process: ").append(process.processName).append("\n"); } - if (process == null) { - return; - } int flags = process.info.flags; IPackageManager pm = AppGlobals.getPackageManager(); sb.append("Flags: 0x").append(Integer.toString(flags, 16)).append("\n"); |