commit f8d20bd6495883e98e23827a2e5ed03766fe483b
author Dianne Hackborn <hackbod@google.com> Wed Nov 30 14:11:17 2011 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Wed Nov 30 14:11:17 2011 -0800
tree 51ae4b7f3bffbd8a70e809166a2993858b2b809b
parent 7797cae2564eccf6d817b06d8116bd9cdc8e9ed4
parent bbb09aceb64bc4ab26283288fbedbdf8b801577d

Merge "Turn off debug log." into ics-mr1

services/java/com/android/server/am/ActivityManagerService.java

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 @@
 
         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;