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

Commit 65103007 authored by Jeffrey Huang's avatar Jeffrey Huang Committed by Android (Google) Code Review
Browse files

Merge "Fix a bug in show surface updates"

parents 3a33b00e 6da6ea87
Loading
Loading
Loading
Loading
+6 −2
Original line number Diff line number Diff line
@@ -81,8 +81,12 @@ public class ShowSurfaceUpdatesPreferenceController extends DeveloperOptionsPref

    @Override
    protected void onDeveloperOptionsSwitchDisabled() {
        if (mPreference.isChecked()) {
            // Writing false to the preference when the setting is already off will have a
            // side effect of turning on the preference that we wish to avoid
            writeShowUpdatesSetting(false);
            mPreference.setChecked(false);
        }
        mPreference.setEnabled(false);
    }

+13 −1
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import static org.mockito.ArgumentMatchers.anyBoolean;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -110,7 +111,18 @@ public class ShowSurfaceUpdatesPreferenceControllerTest {
    }

    @Test
    public void onDeveloperOptionsSwitchDisabled_shouldDisablePreference() {
    public void onDeveloperOptionsSwitchDisabled_preferenceUnchecked_shouldNotTurnOffPreference() {
        when(mPreference.isChecked()).thenReturn(false);
        mController.onDeveloperOptionsSwitchDisabled();

        verify(mController, never()).writeShowUpdatesSetting(anyBoolean());
        verify(mPreference, never()).setChecked(anyBoolean());
        verify(mPreference).setEnabled(false);
    }

    @Test
    public void onDeveloperOptionsSwitchDisabled_preferenceChecked_shouldTurnOffPreference() {
        when(mPreference.isChecked()).thenReturn(true);
        mController.onDeveloperOptionsSwitchDisabled();

        verify(mController).writeShowUpdatesSetting(false);