summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Brown <jeffbrown@google.com>2012-04-10 14:30:20 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-04-10 14:30:20 -0700
commitcd2a3ea5c8aaca505452e3287b2ad30bbba0e8d1 (patch)
tree01d18f3cd91b0f260b01c77fed4d4c9d5039105c
parent592647ee2e2eb64904a3a9c30e8f20b1f08c4ba0 (diff)
parentdeb6ed8c2e63fcb2a189ce6e0338f13edcb7c783 (diff)
downloadframeworks_base-cd2a3ea5c8aaca505452e3287b2ad30bbba0e8d1.zip
frameworks_base-cd2a3ea5c8aaca505452e3287b2ad30bbba0e8d1.tar.gz
frameworks_base-cd2a3ea5c8aaca505452e3287b2ad30bbba0e8d1.tar.bz2
Merge "Don't reuse StringBuilder outside of lock when dumping ANR."
-rw-r--r--services/java/com/android/server/am/ActivityManagerService.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/java/com/android/server/am/ActivityManagerService.java b/services/java/com/android/server/am/ActivityManagerService.java
index 80e59cd..42c42c9 100644
--- a/services/java/com/android/server/am/ActivityManagerService.java
+++ b/services/java/com/android/server/am/ActivityManagerService.java
@@ -3181,7 +3181,7 @@ public final class ActivityManagerService extends ActivityManagerNative
}
// Log the ANR to the main log.
- StringBuilder info = mStringBuilder;
+ StringBuilder info = new StringBuilder();
info.setLength(0);
info.append("ANR in ").append(app.processName);
if (activity != null && activity.shortComponentName != null) {