aboutsummaryrefslogtreecommitdiff
path: root/catapult/devil/devil/android/battery_utils.py
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2021-04-16 17:54:02 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-04-16 17:54:02 +0000
commitef2f29d2b3cf25a46be203d6b12ad0eceaf270b2 (patch)
treeb9a6b60023b853553ae095370bf251a2f1f7640e /catapult/devil/devil/android/battery_utils.py
parent7765787e58b7e3c43ec63e5764e7c4e1223fa0af (diff)
parent19f3aab438b0ede9adb9b1a382d44e143de5bd1e (diff)
downloadchromium-trace-ef2f29d2b3cf25a46be203d6b12ad0eceaf270b2.tar.gz
Merge changes I195c394b,Iff693cf6 am: b101eec5e1 am: d5085cc096 am: 19f3aab438
Original change: https://android-review.googlesource.com/c/platform/external/chromium-trace/+/1677030 Change-Id: Ic028cdd0d1a6d9d99b303ebb29760375db515bcb
Diffstat (limited to 'catapult/devil/devil/android/battery_utils.py')
-rw-r--r--catapult/devil/devil/android/battery_utils.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/catapult/devil/devil/android/battery_utils.py b/catapult/devil/devil/android/battery_utils.py
index e8134d2b..d680f03f 100644
--- a/catapult/devil/devil/android/battery_utils.py
+++ b/catapult/devil/devil/android/battery_utils.py
@@ -300,7 +300,7 @@ class BatteryUtils(object):
'uid': uid,
'data': pwi_entries[uid]
}
- for p, uid in self._cache['uids'].iteritems()
+ for p, uid in self._cache['uids'].items()
}
return {'system_total': system_total, 'per_package': per_package}