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

Commit 784411fc authored by Cole Faust's avatar Cole Faust
Browse files

Fix errorprone issues 

IgnoredPureGetter, LenientFormatStringValidation, ProtocolBufferOrdinal, and ReturnValueIgnored.
https://errorprone.info/bugpatterns

Bug: 253827323
Test: RUN_ERROR_PRONE=true m javac-check
Change-Id: I9975c8689c9d673d0b676c60d68ccec1953470f8
Merged-In: Ia0e16b8be5284d13bed4366cbee0f92748bf2f85
parent feee29ca

tests/robotests/src/com/android/settings/notification/modes/ZenModeAppsPreferenceControllerTest.java

+30 −30
Original line number Diff line number Diff line
@@ -239,11 +239,11 @@ public final class ZenModeAppsPreferenceControllerTest { 


        // MPME is checked; ALL and PRIORITY are unchecked.

        assertThat(((SelectorWithWidgetPreference) mPrefCategory.findPreference(KEY_NONE))

                .isChecked());

        assertThat(!((SelectorWithWidgetPreference) mPrefCategory.findPreference(KEY_ALL))

                .isChecked());

        assertThat(!((SelectorWithWidgetPreference) mPrefCategory.findPreference(KEY_PRIORITY))

                .isChecked());

                .isChecked()).isTrue();

        assertThat(((SelectorWithWidgetPreference) mPrefCategory.findPreference(KEY_ALL))

                .isChecked()).isFalse();

        assertThat(((SelectorWithWidgetPreference) mPrefCategory.findPreference(KEY_PRIORITY))

                .isChecked()).isFalse();



        mPrefCategory.findPreference(KEY_ALL).performClick();
@@ -255,11 +255,11 @@ public final class ZenModeAppsPreferenceControllerTest { 
                .isEqualTo(INTERRUPTION_FILTER_ALL);

        // ALL is now checked; others are unchecked.

        assertThat(((SelectorWithWidgetPreference) mPrefCategory.findPreference(KEY_ALL))

                .isChecked());

        assertThat(!((SelectorWithWidgetPreference) mPrefCategory.findPreference(KEY_NONE))

                .isChecked());

        assertThat(!((SelectorWithWidgetPreference) mPrefCategory.findPreference(KEY_PRIORITY))

                .isChecked());

                .isChecked()).isTrue();

        assertThat(((SelectorWithWidgetPreference) mPrefCategory.findPreference(KEY_NONE))

                .isChecked()).isFalse();

        assertThat(((SelectorWithWidgetPreference) mPrefCategory.findPreference(KEY_PRIORITY))

                .isChecked()).isFalse();

    }



    @Test
@@ -277,11 +277,11 @@ public final class ZenModeAppsPreferenceControllerTest { 
        mPriorityController.updateZenMode(mPriorityPref, zenMode);



        assertThat(((SelectorWithWidgetPreference) mPrefCategory.findPreference(KEY_ALL))

                .isChecked());

        assertThat(!((SelectorWithWidgetPreference) mPrefCategory.findPreference(KEY_NONE))

                .isChecked());

        assertThat(!((SelectorWithWidgetPreference) mPrefCategory.findPreference(KEY_PRIORITY))

                .isChecked());

                .isChecked()).isTrue();

        assertThat(((SelectorWithWidgetPreference) mPrefCategory.findPreference(KEY_NONE))

                .isChecked()).isFalse();

        assertThat(((SelectorWithWidgetPreference) mPrefCategory.findPreference(KEY_PRIORITY))

                .isChecked()).isFalse();



        // Click on NONE

        mPrefCategory.findPreference(KEY_NONE).performClick();
@@ -295,11 +295,11 @@ public final class ZenModeAppsPreferenceControllerTest { 
                .isEqualTo(INTERRUPTION_FILTER_PRIORITY);

        // NONE is now checked; others are unchecked.

        assertThat(((SelectorWithWidgetPreference) mPrefCategory.findPreference(KEY_NONE))

                .isChecked());

        assertThat(!((SelectorWithWidgetPreference) mPrefCategory.findPreference(KEY_ALL))

                .isChecked());

        assertThat(!((SelectorWithWidgetPreference) mPrefCategory.findPreference(KEY_PRIORITY))

                .isChecked());

                .isChecked()).isTrue();

        assertThat(((SelectorWithWidgetPreference) mPrefCategory.findPreference(KEY_ALL))

                .isChecked()).isFalse();

        assertThat(((SelectorWithWidgetPreference) mPrefCategory.findPreference(KEY_PRIORITY))

                .isChecked()).isFalse();

    }



    @Test
@@ -317,11 +317,11 @@ public final class ZenModeAppsPreferenceControllerTest { 
        mPriorityController.updateZenMode(mPriorityPref, zenMode);



        assertThat(((SelectorWithWidgetPreference) mPrefCategory.findPreference(KEY_NONE))

                .isChecked());

        assertThat(!((SelectorWithWidgetPreference) mPrefCategory.findPreference(KEY_ALL))

                .isChecked());

        assertThat(!((SelectorWithWidgetPreference) mPrefCategory.findPreference(KEY_PRIORITY))

                .isChecked());

                .isChecked()).isTrue();

        assertThat(((SelectorWithWidgetPreference) mPrefCategory.findPreference(KEY_ALL))

                .isChecked()).isFalse();

        assertThat(((SelectorWithWidgetPreference) mPrefCategory.findPreference(KEY_PRIORITY))

                .isChecked()).isFalse();



        // Click on PRIORITY

        mPrefCategory.findPreference(KEY_PRIORITY).performClick();
@@ -333,11 +333,11 @@ public final class ZenModeAppsPreferenceControllerTest { 
                .isEqualTo(INTERRUPTION_FILTER_PRIORITY);

        // PRIORITY is now checked; others are unchecked.

        assertThat(((SelectorWithWidgetPreference) mPrefCategory.findPreference(KEY_PRIORITY))

                .isChecked());

        assertThat(!((SelectorWithWidgetPreference) mPrefCategory.findPreference(KEY_ALL))

                .isChecked());

        assertThat(!((SelectorWithWidgetPreference) mPrefCategory.findPreference(KEY_NONE))

                .isChecked());

                .isChecked()).isTrue();

        assertThat(((SelectorWithWidgetPreference) mPrefCategory.findPreference(KEY_ALL))

                .isChecked()).isFalse();

        assertThat(((SelectorWithWidgetPreference) mPrefCategory.findPreference(KEY_NONE))

                .isChecked()).isFalse();

    }



}

tests/robotests/src/com/android/settings/notification/modes/ZenModePrioritySendersPreferenceControllerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -451,7 +451,7 @@ public final class ZenModePrioritySendersPreferenceControllerTest { 
        mMessagesController.updateZenMode(mMessagesPrefCategory, zenMode);



        assertThat(((SelectorWithWidgetPreference) mMessagesPrefCategory.findPreference(KEY_NONE))

                .isChecked());

                .isChecked()).isTrue();



        mMessagesPrefCategory.findPreference(KEY_STARRED).performClick();