PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 6d280250: am c9607b39: am e9b97364: am 14983fc6: am 8bf5f307: Merge "Fix battery detail issues with "Android OS"" into mnc-dev

Browse Source 
* commit '6d2802502cbd69552de7a28c3850ec6d1a75cefc':
  Fix battery detail issues with "Android OS"
This commit is contained in:
Jason Monk
2015-07-24 04:50:03 +00:00
committed by Android Git Automerger
parent 39c9460f38 6d2802502c
commit 47067c7f29
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/fuelgauge/PowerUsageDetail.java
View File

@@ -163,7 +163,9 @@ public class PowerUsageDetail extends PowerUsageBase implements Button.OnClickLi
printWriter.flush(); printWriter.flush();
args.putString(PowerUsageDetail.EXTRA_REPORT_CHECKIN_DETAILS, args.putString(PowerUsageDetail.EXTRA_REPORT_CHECKIN_DETAILS,
result.toString()); result.toString());
userId = UserHandle.getUserId(uid.getUid()); if (uid.getUid() != 0) {
userId = UserHandle.getUserId(uid.getUid());
}
} }
} }
break; break;
@@ -438,11 +440,11 @@ public class PowerUsageDetail extends PowerUsageBase implements Button.OnClickLi
} }
}); });
} else { } else {
removePreference(KEY_HIGH_POWER); mControlsParent.removePreference(findPreference(KEY_HIGH_POWER));
} }
} else { } else {
removePreference(KEY_TWO_BUTTONS); removePreference(KEY_TWO_BUTTONS);
removePreference(KEY_HIGH_POWER); mControlsParent.removePreference(findPreference(KEY_HIGH_POWER));
} }
refreshStats(); refreshStats();

2
src/com/android/settings/fuelgauge/PowerUsageSummary.java
View File

@@ -346,6 +346,8 @@ public class PowerUsageSummary extends PowerUsageBase {
} }
stats.add(new BatterySipper(DrainType.APP, stats.add(new BatterySipper(DrainType.APP,
new FakeUid(Process.FIRST_APPLICATION_UID), use)); new FakeUid(Process.FIRST_APPLICATION_UID), use));
stats.add(new BatterySipper(DrainType.APP,
new FakeUid(0), use));
// Simulate dex2oat process. // Simulate dex2oat process.
BatterySipper sipper = new BatterySipper(DrainType.APP, BatterySipper sipper = new BatterySipper(DrainType.APP,