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

Commit 86aece8b authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change I8dfd6ea8 into eclair 

* changes:
  Handle bad lines in /proc/wakelocks : Fix for 2124260
parents 1537a255 53b707ba

core/java/com/android/internal/os/BatteryStatsImpl.java

+4 −4
Original line number Diff line number Diff line
@@ -867,15 +867,15 @@ public final class BatteryStatsImpl extends BatteryStats { 


                String[] nameStringArray = mProcWakelocksName;

                long[] wlData = mProcWakelocksData;

                Process.parseProcLine(wlBuffer, startIndex, endIndex, PROC_WAKELOCKS_FORMAT, 

                        nameStringArray, wlData, null);

                boolean parsed = Process.parseProcLine(wlBuffer, startIndex, endIndex,

                        PROC_WAKELOCKS_FORMAT, nameStringArray, wlData, null);

                

                name = nameStringArray[0];

                count = (int) wlData[1];

                // convert nanoseconds to microseconds with rounding.

                totalTime = (wlData[2] + 500) / 1000;



                if (name.length() > 0) {

                if (parsed && name.length() > 0) {

                    if (!m.containsKey(name)) {

                        m.put(name, new KernelWakelockStats(count, totalTime, 

                                sKernelWakelockUpdateVersion));