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

Commit 198b0b6e authored by Fabian Kozynski's avatar Fabian Kozynski
Browse files

Do not destroy CustomTile when in QSCustomizer 

Before this CL, TileQueryHelper would create CustomTile when creating
tiles for current tiles. This caused them to be destroyed after taking
the information and being removed from the maps in TileServices.

In this CL, current CustomTile are fixed to only being created by
addPackageTiles which knows what to do.

Fixes: 148002667
Fixes: 127508346
Test: manual
Test: atest TileQueryHelperTest
Change-Id: I2c4d3ce6c31449f20670982dad334019cc25469c
parent 7901f7f1

packages/SystemUI/src/com/android/systemui/qs/customize/TileQueryHelper.java

+3 −1
Original line number Diff line number Diff line
@@ -111,7 +111,9 @@ public class TileQueryHelper { 


        final ArrayList<QSTile> tilesToAdd = new ArrayList<>();

        for (String spec : possibleTiles) {

            // Only add current and stock tiles that can be created from QSFactoryImpl

            // Only add current and stock tiles that can be created from QSFactoryImpl.

            // Do not include CustomTile. Those will be created by `addPackageTiles`.

            if (spec.startsWith(CustomTile.PREFIX)) continue;

            final QSTile tile = host.createTile(spec);

            if (tile == null) {

                continue;

packages/SystemUI/tests/src/com/android/systemui/qs/customize/TileQueryHelperTest.java

+12 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ import static org.mockito.Mockito.any; 
import static org.mockito.Mockito.atLeastOnce;

import static org.mockito.Mockito.doAnswer;

import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.never;

import static org.mockito.Mockito.times;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;
@@ -77,12 +78,14 @@ public class TileQueryHelperTest extends SysuiTestCase { 
    private static final Set<String> FACTORY_TILES = new ArraySet<>();

    private static final String TEST_PKG = "test_pkg";

    private static final String TEST_CLS = "test_cls";

    private static final String CUSTOM_TILE = "custom(" + TEST_PKG + "/" + TEST_CLS + ")";



    static {

        FACTORY_TILES.addAll(Arrays.asList(

                new String[]{"wifi", "bt", "cell", "dnd", "inversion", "airplane", "work",

                        "rotation", "flashlight", "location", "cast", "hotspot", "user", "battery",

                        "saver", "night", "nfc"}));

        FACTORY_TILES.add(CUSTOM_TILE);

    }



    @Mock
@@ -222,6 +225,15 @@ public class TileQueryHelperTest extends SysuiTestCase { 
        assertFalse(specs.contains("other"));

    }



    @Test

    public void testCustomTileNotCreated() {

        Settings.Secure.putString(mContext.getContentResolver(), Settings.Secure.QS_TILES,

                CUSTOM_TILE);

        mTileQueryHelper.queryTiles(mQSTileHost);

        FakeExecutor.exhaustExecutors(mMainExecutor, mBgExecutor);

        verify(mQSTileHost, never()).createTile(CUSTOM_TILE);

    }



    @Test

    public void testThirdPartyTilesInactive() {

        ResolveInfo resolveInfo = new ResolveInfo();