From a21ac03acb5a25caf4165d9fae3b39f43b8d006b Mon Sep 17 00:00:00 2001
From: Cole Faust <colefaust@google.com>
Date: Mon, 15 Aug 2022 18:52:37 -0700
Subject: [PATCH] Fix array-related errorprone warnings

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: Ida6513002f8fd845a385924be290b720f06c4748
---
 .../android/settings/applications/AppStateAppOpsBridge.java  | 2 +-
 .../settings/notification/zen/ZenModeEventRuleSettings.java  | 5 +++--
 .../notification/zen/ZenModeScheduleRuleSettings.java        | 2 +-
 src/com/android/settings/wifi/WifiConfigController.java      | 2 +-
 src/com/android/settings/wifi/WifiConfigController2.java     | 2 +-
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/com/android/settings/applications/AppStateAppOpsBridge.java b/src/com/android/settings/applications/AppStateAppOpsBridge.java
index 2ccdc78413a..f51ea60e570 100755
--- a/src/com/android/settings/applications/AppStateAppOpsBridge.java
+++ b/src/com/android/settings/applications/AppStateAppOpsBridge.java
@@ -243,7 +243,7 @@ public abstract class AppStateAppOpsBridge extends AppStateBaseBridge {
             }
         } catch (RemoteException e) {
             Log.w(TAG, "PackageManager is dead. Can't get list of packages granted "
-                    + mPermissions, e);
+                    + Arrays.toString(mPermissions), e);
             return;
         }
     }
diff --git a/src/com/android/settings/notification/zen/ZenModeEventRuleSettings.java b/src/com/android/settings/notification/zen/ZenModeEventRuleSettings.java
index 3c4930184fe..791021d441b 100644
--- a/src/com/android/settings/notification/zen/ZenModeEventRuleSettings.java
+++ b/src/com/android/settings/notification/zen/ZenModeEventRuleSettings.java
@@ -38,6 +38,7 @@ import com.android.settings.R;
 import com.android.settingslib.core.AbstractPreferenceController;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
@@ -113,11 +114,11 @@ public class ZenModeEventRuleSettings extends ZenModeRuleSettingsBase {
 
         CharSequence[] entriesArr = entries.toArray(new CharSequence[entries.size()]);
         CharSequence[] valuesArr = values.toArray(new CharSequence[values.size()]);
-        if (!Objects.equals(mCalendar.getEntries(), entriesArr)) {
+        if (!Arrays.equals(mCalendar.getEntries(), entriesArr)) {
             mCalendar.setEntries(entriesArr);
         }
 
-        if (!Objects.equals(mCalendar.getEntryValues(), valuesArr)) {
+        if (!Arrays.equals(mCalendar.getEntryValues(), valuesArr)) {
             mCalendar.setEntryValues(valuesArr);
         }
     }
diff --git a/src/com/android/settings/notification/zen/ZenModeScheduleRuleSettings.java b/src/com/android/settings/notification/zen/ZenModeScheduleRuleSettings.java
index 5b02b3b0c18..1f7117cb184 100644
--- a/src/com/android/settings/notification/zen/ZenModeScheduleRuleSettings.java
+++ b/src/com/android/settings/notification/zen/ZenModeScheduleRuleSettings.java
@@ -231,7 +231,7 @@ public class ZenModeScheduleRuleSettings extends ZenModeRuleSettingsBase {
                     protected void onChanged(final int[] days) {
                         if (mDisableListeners) return;
                         if (Arrays.equals(days, mSchedule.days)) return;
-                        if (DEBUG) Log.d(TAG, "days.onChanged days=" + Arrays.asList(days));
+                        if (DEBUG) Log.d(TAG, "days.onChanged days=" + Arrays.toString(days));
                         mSchedule.days = days;
                         updateRule(ZenModeConfig.toScheduleConditionId(mSchedule));
                     }
diff --git a/src/com/android/settings/wifi/WifiConfigController.java b/src/com/android/settings/wifi/WifiConfigController.java
index 0c063db8a78..8f0a983d1ff 100644
--- a/src/com/android/settings/wifi/WifiConfigController.java
+++ b/src/com/android/settings/wifi/WifiConfigController.java
@@ -746,7 +746,7 @@ public class WifiConfigController implements TextWatcher,
                 if (config.enterpriseConfig.getCaCertificateAliases() != null
                         && config.enterpriseConfig.getCaPath() != null) {
                     Log.e(TAG, "ca_cert ("
-                            + config.enterpriseConfig.getCaCertificateAliases()
+                            + Arrays.toString(config.enterpriseConfig.getCaCertificateAliases())
                             + ") and ca_path ("
                             + config.enterpriseConfig.getCaPath()
                             + ") should not both be non-null");
diff --git a/src/com/android/settings/wifi/WifiConfigController2.java b/src/com/android/settings/wifi/WifiConfigController2.java
index 127c882340c..5ab82788431 100644
--- a/src/com/android/settings/wifi/WifiConfigController2.java
+++ b/src/com/android/settings/wifi/WifiConfigController2.java
@@ -731,7 +731,7 @@ public class WifiConfigController2 implements TextWatcher,
                 if (config.enterpriseConfig.getCaCertificateAliases() != null
                         && config.enterpriseConfig.getCaPath() != null) {
                     Log.e(TAG, "ca_cert ("
-                            + config.enterpriseConfig.getCaCertificateAliases()
+                            + Arrays.toString(config.enterpriseConfig.getCaCertificateAliases())
                             + ") and ca_path ("
                             + config.enterpriseConfig.getCaPath()
                             + ") should not both be non-null");