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

Commit 53b707ba authored by Amith Yamasani's avatar Amith Yamasani
Browse files

Handle bad lines in /proc/wakelocks : Fix for 2124260 

Use the return value from the native parser to skip over bad lines. When
the wakelocks overflow, there could be empty or badly formatted lines.
Skip over them.
parent 8eb0f348

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