Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bc4fcec7 authored by Jason Parks's avatar Jason Parks Committed by Android Git Automerger
Browse files

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

Merge commit '29e25bd3' into gingerbread-plus-aosp

* commit '29e25bd3':
  Only print out wake locks in the if the wakelock was held.
parents c78f9a0e 29e25bd3

core/java/android/os/BatteryStats.java

+5 −7
Original line number Diff line number Diff line
@@ -1237,13 +1237,12 @@ public abstract class BatteryStats implements Parcelable { 
                            linePrefix);

                    if (!linePrefix.equals(": ")) {

                        sb.append(" realtime");

                    } else {

                        sb.append(": (nothing executed)");

                    }

                        // Only print out wake locks that were held

                        pw.println(sb.toString());

                    }

                }

            }

        }

    

        for (int iu = 0; iu < NU; iu++) {

            Uid u = uidStats.valueAt(iu);
@@ -1453,13 +1452,12 @@ public abstract class BatteryStats implements Parcelable { 
                            "window", which, linePrefix);

                    if (!linePrefix.equals(": ")) {

                        sb.append(" realtime");

                    } else {

                        sb.append(": (nothing executed)");

                    }

                        // Only print out wake locks that were held

                        pw.println(sb.toString());

                        uidActivity = true;

                    }

                }

            }



            Map<Integer, ? extends BatteryStats.Uid.Sensor> sensors = u.getSensorStats();

            if (sensors.size() > 0) {