Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix array-related errorprone warnings

Browse Source 
The ArrayEquals, ArrayHashCode, ArrayToString, and
ArraysAsListPrimitiveArray errorprone findings were
demoted from errors to warnings. Fix existing
occurrences of them so they can be made errors again.

Bug: 242630963
Test: RUN_ERROR_PRONE=true m javac-check
Change-Id: I96d0828c9e2c634d496e99878aeb185e6a824e64
This commit is contained in:
Cole Faust
2022-10-04 11:35:50 -07:00
parent 899a59439b
commit 13ab84ecd7
1 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
services/core/java/com/android/server/power/stats/BatteryStatsImpl.java
View File

@@ -6813,20 +6813,31 @@ public class BatteryStatsImpl extends BatteryStats {
synchronized (mModemNetworkLock) {
if (displayTransport == TRANSPORT_CELLULAR) {
mModemIfaces = includeInStringArray(mModemIfaces, iface);
if (DEBUG) Slog.d(TAG, "Note mobile iface " + iface + ": " + mModemIfaces);
if (DEBUG) {
Slog.d(TAG, "Note mobile iface " + iface + ": "
+ Arrays.toString(mModemIfaces));
}
} else {
mModemIfaces = excludeFromStringArray(mModemIfaces, iface);
if (DEBUG) Slog.d(TAG, "Note non-mobile iface " + iface + ": " + mModemIfaces);
if (DEBUG) {
Slog.d(TAG, "Note non-mobile iface " + iface + ": "
+ Arrays.toString(mModemIfaces));
}
}
}
synchronized (mWifiNetworkLock) {
if (displayTransport == TRANSPORT_WIFI) {
mWifiIfaces = includeInStringArray(mWifiIfaces, iface);
if (DEBUG) Slog.d(TAG, "Note wifi iface " + iface + ": " + mWifiIfaces);
if (DEBUG) {
Slog.d(TAG, "Note wifi iface " + iface + ": " + Arrays.toString(mWifiIfaces));
}
} else {
mWifiIfaces = excludeFromStringArray(mWifiIfaces, iface);
if (DEBUG) Slog.d(TAG, "Note non-wifi iface " + iface + ": " + mWifiIfaces);
if (DEBUG) {
Slog.d(TAG, "Note non-wifi iface " + iface + ": "
+ Arrays.toString(mWifiIfaces));
}
}
}
}
@@ -12622,8 +12633,7 @@ public class BatteryStatsImpl extends BatteryStats {
private void updateCpuMeasuredEnergyStatsLocked(@NonNull long[] clusterChargeUC,
@NonNull CpuDeltaPowerAccumulator accumulator) {
if (DEBUG_ENERGY) {
Slog.d(TAG,
"Updating cpu cluster stats: " + clusterChargeUC.toString());
Slog.d(TAG, "Updating cpu cluster stats: " + Arrays.toString(clusterChargeUC));
}
if (mGlobalMeasuredEnergyStats == null) {
return;