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

Commit 7cf363d1 authored by Fabián Kozynski's avatar Fabián Kozynski Committed by Fabian Kozynski
Browse files

Unbind TileService onNullBinding 

Test: atest TileLifecycleManagerTest
Test: manual: adb shell dumpsys activity service
Test: sts test
Bug: 300903792
Change-Id: Ia8126ac65432b124683960e3ebf47301ba6172a1
Merged-In: Ia8126ac65432b124683960e3ebf47301ba6172a1
parent 4f70c066

packages/SystemUI/src/com/android/systemui/qs/external/TileLifecycleManager.java

+5 −0
Original line number Diff line number Diff line
@@ -280,6 +280,11 @@ public class TileLifecycleManager extends BroadcastReceiver implements 
        handlePendingMessages();

    }



    @Override

    public void onNullBinding(ComponentName name) {

        executeSetBindService(false);

    }



    @Override

    public void onServiceDisconnected(ComponentName name) {

        if (DEBUG) Log.d(TAG, "onServiceDisconnected " + name);

packages/SystemUI/tests/src/com/android/systemui/qs/external/TileLifecycleManagerTest.java

+24 −0
Original line number Diff line number Diff line
@@ -373,6 +373,30 @@ public class TileLifecycleManagerTest extends SysuiTestCase { 
        verify(falseContext).bindServiceAsUser(any(), any(), eq(flags), any());

    }



    @Test

    public void testNullBindingCallsUnbind() {

        Context mockContext = mock(Context.class);

        // Binding has to succeed

        when(mockContext.bindServiceAsUser(any(), any(), anyInt(), any())).thenReturn(true);

        TileLifecycleManager manager = new TileLifecycleManager(mHandler, mockContext,

                mock(IQSService.class),

                mMockPackageManagerAdapter,

                mMockBroadcastDispatcher,

                mTileServiceIntent,

                mUser,

                mExecutor);



        manager.executeSetBindService(true);

        mExecutor.runAllReady();



        ArgumentCaptor<ServiceConnection> captor = ArgumentCaptor.forClass(ServiceConnection.class);

        verify(mockContext).bindServiceAsUser(any(), captor.capture(), anyInt(), any());



        captor.getValue().onNullBinding(mTileServiceComponentName);

        mExecutor.runAllReady();

        verify(mockContext).unbindService(captor.getValue());

    }



    private void mockChangeEnabled(long changeId, boolean enabled) {

        doReturn(enabled).when(() -> CompatChanges.isChangeEnabled(eq(changeId), anyString(),

                any(UserHandle.class)));