diff options
| author | Dianne Hackborn <hackbod@google.com> | 2015-04-23 16:26:39 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-23 16:26:41 +0000 |
| commit | 4d7c8e04a29a0c473e5bf08e7a3ae8c8e45c7aaf (patch) | |
| tree | 7786c7a9a1472ee5bf32f9b4e46cb1cfa4c4d17a /services | |
| parent | 871af4839024f58f7e36c8e2284325ba401212ba (diff) | |
| parent | 13a6a9b39ed99fa38e452dd0aacfe1897f32d84a (diff) | |
| download | frameworks_base-4d7c8e04a29a0c473e5bf08e7a3ae8c8e45c7aaf.zip frameworks_base-4d7c8e04a29a0c473e5bf08e7a3ae8c8e45c7aaf.tar.gz frameworks_base-4d7c8e04a29a0c473e5bf08e7a3ae8c8e45c7aaf.tar.bz2 | |
Merge "Maybe fix needing wifi permission to dump battery stats."
Diffstat (limited to 'services')
| -rw-r--r-- | services/core/java/com/android/server/am/BatteryStatsService.java | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/services/core/java/com/android/server/am/BatteryStatsService.java b/services/core/java/com/android/server/am/BatteryStatsService.java index 905adc0..58665d7 100644 --- a/services/core/java/com/android/server/am/BatteryStatsService.java +++ b/services/core/java/com/android/server/am/BatteryStatsService.java @@ -982,9 +982,18 @@ public final class BatteryStatsService extends IBatteryStats.Stub if (noOutput) { return; } - if (BatteryStatsHelper.checkWifiOnly(mContext)) { - flags |= BatteryStats.DUMP_DEVICE_WIFI_ONLY; + + long ident = Binder.clearCallingIdentity(); + try { + if (BatteryStatsHelper.checkWifiOnly(mContext)) { + flags |= BatteryStats.DUMP_DEVICE_WIFI_ONLY; + } + // Fetch data from external sources and update the BatteryStatsImpl object with them. + updateExternalStats("dump"); + } finally { + Binder.restoreCallingIdentity(ident); } + if (reqUid >= 0) { // By default, if the caller is only interested in a specific package, then // we only dump the aggregated data since charged. @@ -995,9 +1004,6 @@ public final class BatteryStatsService extends IBatteryStats.Stub } } - // Fetch data from external sources and update the BatteryStatsImpl object with them. - updateExternalStats("dump"); - if (useCheckinFormat) { List<ApplicationInfo> apps = mContext.getPackageManager().getInstalledApplications(0); if (isRealCheckin) { |