am 9ab84c2: Merge "Fix wrong count return for getPhoneSignalStrengthCount"

Jean-Baptiste Queru · Android Git Automerger · commit bce413587973 · 2012-08-08T13:08:31.000-07:00
* commit '9ab84c203fea0521135e0b0983aa15ce1afdc5ec':
  Fix wrong count return for getPhoneSignalStrengthCount
diff --git a/core/java/com/android/internal/os/BatteryStatsImpl.java b/core/java/com/android/internal/os/BatteryStatsImpl.java
@@ -2302,8 +2302,8 @@ public void noteNetworkInterfaceTypeLocked(String iface, int networkType) {
                 batteryRealtime, which);
     }
 
-    @Override public int getPhoneSignalStrengthCount(int dataType, int which) {
-        return mPhoneDataConnectionsTimer[dataType].getCountLocked(which);
+    @Override public int getPhoneSignalStrengthCount(int strengthBin, int which) {
+        return mPhoneSignalStrengthsTimer[strengthBin].getCountLocked(which);
     }
 
     @Override public long getPhoneDataConnectionTime(int dataType,

Original file line number	Diff line number	Diff line change
`@@ -2302,8 +2302,8 @@ public void noteNetworkInterfaceTypeLocked(String iface, int networkType) {`
`2302`	`2302`	`batteryRealtime, which);`
`2303`	`2303`	`}`
`2304`	`2304`
`2305`		`- @Override public int getPhoneSignalStrengthCount(int dataType, int which) {`
`2306`		`- return mPhoneDataConnectionsTimer[dataType].getCountLocked(which);`
	`2305`	`+ @Override public int getPhoneSignalStrengthCount(int strengthBin, int which) {`
	`2306`	`+ return mPhoneSignalStrengthsTimer[strengthBin].getCountLocked(which);`
`2307`	`2307`	`}`
`2308`	`2308`
`2309`	`2309`	`@Override public long getPhoneDataConnectionTime(int dataType,`