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

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

Browse Source 
* commit '23e19066de2caf1db1fa0759ac49a1118b59f7a5':
  BatteryStats: Read /proc/wakelocks first before trying /d/wakeup_sources
This commit is contained in:
Adam Lesinski
2015-07-21 19:40:24 +00:00
committed by Android Git Automerger
parent 6391a8d446 23e19066de
commit a50f43e002
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/com/android/internal/os/KernelWakelockReader.java
View File

@@ -68,12 +68,12 @@ public class KernelWakelockReader {
try {
FileInputStream is;
try {
is = new FileInputStream(sWakeupSourceFile);
wakeup_sources = true;
is = new FileInputStream(sWakelockFile);
wakeup_sources = false;
} catch (java.io.FileNotFoundException e) {
try {
is = new FileInputStream(sWakelockFile);
wakeup_sources = false;
is = new FileInputStream(sWakeupSourceFile);
wakeup_sources = true;
} catch (java.io.FileNotFoundException e2) {
return null;
}