Merge "Removing extraneous field from batterystats dumpsys." into nyc-dev am: 3cabb2a

am: 6c0291c

* commit '6c0291c144e28b958718a8bcdc9a02de99f2bcf4':
  Removing extraneous field from batterystats dumpsys.

Change-Id: Id6ef61f3fed21c4dd394402834987696f4153e48
This commit is contained in:
Kweku Adams
2016-04-25 20:52:00 +00:00
committed by android-build-merger

View File

@@ -3090,7 +3090,7 @@ public abstract class BatteryStats implements Parcelable {
|| uidWifiRunningTime != 0) {
dumpLine(pw, uid, category, WIFI_DATA, fullWifiLockOnTime, wifiScanTime,
uidWifiRunningTime, wifiScanCount,
/* legacy fields follow, keep at 0 */ 0, 0, 0, 0);
/* legacy fields follow, keep at 0 */ 0, 0, 0);
}
dumpControllerActivityLine(pw, uid, category, WIFI_CONTROLLER_DATA,