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

Commit 26bfaa5c authored by Adam Lesinski's avatar Adam Lesinski Committed by Android Git Automerger
Browse files

am 208d273e: am e1cd38e9: am ca34b184: am a50f43e0: am 23e19066: Merge... 

am 208d273e: am e1cd38e9: am ca34b184: am a50f43e0: am 23e19066: Merge "BatteryStats: Read /proc/wakelocks first before trying /d/wakeup_sources" into mnc-dev

* commit '208d273e':
  BatteryStats: Read /proc/wakelocks first before trying /d/wakeup_sources
parents d795d4ff 208d273e

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

+4 −4
Original line number Diff line number Diff line
@@ -67,13 +67,13 @@ public class KernelWakelockReader { 


        try {

            FileInputStream is;

            try {

                is = new FileInputStream(sWakeupSourceFile);

                wakeup_sources = true;

            } catch (java.io.FileNotFoundException e) {

            try {

                is = new FileInputStream(sWakelockFile);

                wakeup_sources = false;

            } catch (java.io.FileNotFoundException e) {

                try {

                    is = new FileInputStream(sWakeupSourceFile);

                    wakeup_sources = true;

                } catch (java.io.FileNotFoundException e2) {

                    return null;

                }