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

Commit 3178ea5f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Background activity starts are now blocked by default." into qt-dev

parents 3da9f727 303c31f4

src/com/android/settings/development/AllowBackgroundActivityStartsPreferenceController.java

+2 −2
Original line number Diff line number Diff line
@@ -82,10 +82,10 @@ public class AllowBackgroundActivityStartsPreferenceController 


    private boolean isDefaultEnabled() {

        // The default in the absence of user preference is settable via DeviceConfig.

        // Note that the default default is enabled.

        // Note that the default default is disabled.

        return DeviceConfig.getBoolean(

                DeviceConfig.NAMESPACE_ACTIVITY_MANAGER,

                KEY_DEFAULT_BACKGROUND_ACTIVITY_STARTS_ENABLED,

                /*defaultValue*/ true);

                /*defaultValue*/ false);

    }

}

tests/robotests/src/com/android/settings/development/AllowBackgroundActivityStartsPreferenceControllerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ public class AllowBackgroundActivityStartsPreferenceControllerTest { 
    public void onDeveloperOptionsSwitchDisabled_noDefault_shouldResetPreference() {

        mController.onDeveloperOptionsSwitchDisabled();



        verify(mPreference).setChecked(true);

        verify(mPreference).setChecked(false);

        verify(mPreference).setEnabled(false);



        assertThat(getModeFroMSettings()).isEqualTo(-1);