Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Only print out wake locks in the if the wakelock was held." into gingerbread

Browse Source
This commit is contained in:
Jason Parks
2010-07-20 14:01:39 -07:00
committed by Android (Google) Code Review
parent 3c1363beec 94b916da2c
commit 29e25bd341
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/android/os/BatteryStats.java
View File

@@ -1237,13 +1237,12 @@ public abstract class BatteryStats implements Parcelable {
linePrefix); linePrefix);
if (!linePrefix.equals(": ")) { if (!linePrefix.equals(": ")) {
sb.append(" realtime"); sb.append(" realtime");
} else { // Only print out wake locks that were held
sb.append(": (nothing executed)");
}
pw.println(sb.toString()); pw.println(sb.toString());
} }
} }
} }
}
for (int iu = 0; iu < NU; iu++) { for (int iu = 0; iu < NU; iu++) {
Uid u = uidStats.valueAt(iu); Uid u = uidStats.valueAt(iu);
@@ -1453,13 +1452,12 @@ public abstract class BatteryStats implements Parcelable {
"window", which, linePrefix); "window", which, linePrefix);
if (!linePrefix.equals(": ")) { if (!linePrefix.equals(": ")) {
sb.append(" realtime"); sb.append(" realtime");
} else { // Only print out wake locks that were held
sb.append(": (nothing executed)");
}
pw.println(sb.toString()); pw.println(sb.toString());
uidActivity = true; uidActivity = true;
} }
} }
}
Map<Integer, ? extends BatteryStats.Uid.Sensor> sensors = u.getSensorStats(); Map<Integer, ? extends BatteryStats.Uid.Sensor> sensors = u.getSensorStats();
if (sensors.size() > 0) { if (sensors.size() > 0) {