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

Commit cea9ff38 authored by Elliot Sisteron's avatar Elliot Sisteron
Browse files

Respond with null data when no screen lock. 

Safety Center expects a response to the broadcast in this case.
The Settings app should respond with explicitely no data to Safety
Center rather than not respond.

Bug: 295845686
Test: atest LockScreenSafetySourceTest
Change-Id: Ibaa134b1f93304731f37444ab222b3dc628bae02
parent 322ad6a6

src/com/android/settings/safetycenter/LockScreenSafetySource.java

+6 −0
Original line number Diff line number Diff line
@@ -63,6 +63,12 @@ public final class LockScreenSafetySource { 
        }



        if (!screenLockPreferenceDetailsUtils.isAvailable()) {

            SafetyCenterManagerWrapper.get().setSafetySourceData(

                    context,

                    SAFETY_SOURCE_ID,

                    /* safetySourceData= */ null,

                    safetyEvent

            );

            return;

        }

tests/unit/src/com/android/settings/safetycenter/LockScreenSafetySourceTest.java

+3 −3
Original line number Diff line number Diff line
@@ -102,15 +102,15 @@ public class LockScreenSafetySourceTest { 
    }



    @Test

    public void setSafetySourceData_whenScreenLockIsDisabled_doesNotSetData() {

    public void setSafetySourceData_whenScreenLockIsDisabled_setsNullData() {

        when(mSafetyCenterManagerWrapper.isEnabled(mApplicationContext)).thenReturn(true);

        when(mScreenLockPreferenceDetailsUtils.isAvailable()).thenReturn(false);



        LockScreenSafetySource.setSafetySourceData(mApplicationContext,

                mScreenLockPreferenceDetailsUtils, EVENT_SOURCE_STATE_CHANGED);



        verify(mSafetyCenterManagerWrapper, never()).setSafetySourceData(

                any(), any(), any(), any());

        verify(mSafetyCenterManagerWrapper).setSafetySourceData(

                any(), eq(LockScreenSafetySource.SAFETY_SOURCE_ID), eq(null), any());

    }



    @Test