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

Jean-Baptiste Queru · Android Git Automerger · commit 86d09388ee1b · 2012-08-08T13:11:33.000-07:00
* commit 'bce413587973eae29a783d7e273dc2f7db06f7c9':
  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
@@ -2332,8 +2332,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
`@@ -2332,8 +2332,8 @@ public void noteNetworkInterfaceTypeLocked(String iface, int networkType) {`
`2332`	`2332`	`batteryRealtime, which);`
`2333`	`2333`	`}`
`2334`	`2334`
`2335`		`- @Override public int getPhoneSignalStrengthCount(int dataType, int which) {`
`2336`		`- return mPhoneDataConnectionsTimer[dataType].getCountLocked(which);`
	`2335`	`+ @Override public int getPhoneSignalStrengthCount(int strengthBin, int which) {`
	`2336`	`+ return mPhoneSignalStrengthsTimer[strengthBin].getCountLocked(which);`
`2337`	`2337`	`}`
`2338`	`2338`
`2339`	`2339`	`@Override public long getPhoneDataConnectionTime(int dataType,`