summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2011-11-30 14:11:17 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-11-30 14:11:17 -0800
commitf8d20bd6495883e98e23827a2e5ed03766fe483b (patch)
tree51ae4b7f3bffbd8a70e809166a2993858b2b809b
parent7797cae2564eccf6d817b06d8116bd9cdc8e9ed4 (diff)
parentbbb09aceb64bc4ab26283288fbedbdf8b801577d (diff)
downloadframeworks_base-f8d20bd6495883e98e23827a2e5ed03766fe483b.zip
frameworks_base-f8d20bd6495883e98e23827a2e5ed03766fe483b.tar.gz
frameworks_base-f8d20bd6495883e98e23827a2e5ed03766fe483b.tar.bz2
Merge "Turn off debug log." into ics-mr1
-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 367844d..b36ba3a 100644
--- a/services/java/com/android/server/am/ActivityManagerService.java
+++ b/services/java/com/android/server/am/ActivityManagerService.java
@@ -14249,7 +14249,7 @@ public final class ActivityManagerService extends ActivityManagerNative
if (app.curAdj != app.setAdj) {
if (Process.setOomAdj(app.pid, app.curAdj)) {
- if (true || DEBUG_SWITCH || DEBUG_OOM_ADJ) Slog.v(
+ if (DEBUG_SWITCH || DEBUG_OOM_ADJ) Slog.v(
TAG, "Set " + app.pid + " " + app.processName +
" adj " + app.curAdj + ": " + app.adjType);
app.setAdj = app.curAdj;