PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix array-related errorprone warnings"

Browse Source
This commit is contained in:
Treehugger Robot
2022-08-17 18:37:46 +00:00
committed by Gerrit Code Review
parent c27f705eb7 a21ac03acb
commit a93e78f781
5 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/applications/AppStateAppOpsBridge.java
View File

@@ -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;
}
}

5
src/com/android/settings/notification/zen/ZenModeEventRuleSettings.java
View File

@@ -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);
}
}

2
src/com/android/settings/notification/zen/ZenModeScheduleRuleSettings.java
View File

@@ -210,7 +210,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));
}

2
src/com/android/settings/wifi/WifiConfigController.java
View File

@@ -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");

2
src/com/android/settings/wifi/WifiConfigController2.java
View File

@@ -737,7 +737,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");