Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ac7a368a authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix array-related errorprone warnings" am: a93e78f7 am: a89e7aea... 

Merge "Fix array-related errorprone warnings" am: a93e78f7 am: a89e7aea am: cdacabf9 am: 49a0bbc6

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2183972



Change-Id: I9c4c43088154202d5818b29d010f053a7630ec90
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a2172abb 49a0bbc6

src/com/android/settings/applications/AppStateAppOpsBridge.java

+1 −1
Original line number Diff line number Diff line
@@ -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;

        }

    }

src/com/android/settings/notification/zen/ZenModeEventRuleSettings.java

+3 −2
Original line number Diff line number Diff line
@@ -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);

        }

    }

src/com/android/settings/notification/zen/ZenModeScheduleRuleSettings.java

+1 −1
Original line number Diff line number Diff line
@@ -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));

                    }

src/com/android/settings/wifi/WifiConfigController.java

+1 −1
Original line number Diff line number Diff line
@@ -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");

src/com/android/settings/wifi/WifiConfigController2.java

+1 −1
Original line number Diff line number Diff line
@@ -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");