commit | eba00ce996d6646f558f25890f0a551de8e7ecf7 | [log] [tgz] |
---|---|---|
author | Dianne Hackborn <hackbod@google.com> | Mon Mar 26 11:12:28 2012 -0700 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Mar 26 11:12:28 2012 -0700 |
tree | d22e8a9962db04e90d3018990dfa1c70c11f2ae7 | |
parent | a026b48972316d05a75b6dde883be39b1e046891 [diff] | |
parent | 69dc66e91bcf1d982ae23b7c67cf82d6dd0e8056 [diff] |
Merge "Okay now let's really turn it off."
diff --git a/services/java/com/android/server/am/ActivityManagerService.java b/services/java/com/android/server/am/ActivityManagerService.java index 699bd50..37a594e 100644 --- a/services/java/com/android/server/am/ActivityManagerService.java +++ b/services/java/com/android/server/am/ActivityManagerService.java
@@ -3038,7 +3038,7 @@ } final void logAppTooSlow(ProcessRecord app, long startTime, String msg) { - if (true && IS_USER_BUILD) { + if (true || IS_USER_BUILD) { return; } String tracesPath = SystemProperties.get("dalvik.vm.stack-trace-file", null);