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

Commit 7d2777eb authored by Fabian Kozynski's avatar Fabian Kozynski Committed by Android (Google) Code Review
Browse files

Merge "Remove flagged code" into main

parents 230233aa 8ac92041

packages/SystemUI/multivalentTests/src/com/android/systemui/qs/external/CloseShadeRightAfterClickTestB339290820.kt

+8 −12
Original line number Diff line number Diff line
@@ -28,18 +28,16 @@ import android.os.Binder 
import android.os.Handler

import android.os.RemoteException

import android.os.UserHandle

import android.platform.test.annotations.EnableFlags

import android.service.quicksettings.Tile

import android.testing.TestableContext

import androidx.test.ext.junit.runners.AndroidJUnit4

import androidx.test.filters.SmallTest

import com.android.systemui.Flags.FLAG_QS_CUSTOM_TILE_CLICK_GUARANTEED_BUG_FIX

import com.android.systemui.SysuiTestCase

import com.android.systemui.concurrency.fakeExecutor

import com.android.systemui.kosmos.testCase

import com.android.systemui.qs.pipeline.shared.TileSpec

import com.android.systemui.qs.tiles.impl.custom.packageManagerAdapterFacade

import com.android.systemui.qs.tiles.impl.custom.customTileSpec

import com.android.systemui.qs.tiles.impl.custom.packageManagerAdapterFacade

import com.android.systemui.testKosmos

import com.android.systemui.util.concurrency.FakeExecutor

import com.android.systemui.util.mockito.whenever
@@ -77,7 +75,6 @@ class CloseShadeRightAfterClickTestB339290820 : SysuiTestCase() { 
    }



    @Test

    @EnableFlags(FLAG_QS_CUSTOM_TILE_CLICK_GUARANTEED_BUG_FIX)

    fun testStopListeningShortlyAfterClick_clickIsSent() {

        with(kosmos) {

            val tile = FakeCustomTileInterface(tileServices)
@@ -111,6 +108,7 @@ private val testComponentName = ComponentName("pkg", "srv") 
private class FakeCustomTileInterface(tileServices: TileServices) : CustomTileInterface {

    override val user: Int

        get() = 0



    override val qsTile: Tile = Tile()

    override val component: ComponentName = testComponentName

    private var listening = false
@@ -167,15 +165,13 @@ private class FakeCustomTileInterface(tileServices: TileServices) : CustomTileIn 
    }

}



private class ContextWrapperDelayedBind(

    val context: Context,

    val executor: FakeExecutor,

) : ContextWrapper(context) {

private class ContextWrapperDelayedBind(val context: Context, val executor: FakeExecutor) :

    ContextWrapper(context) {

    override fun bindServiceAsUser(

        service: Intent,

        conn: ServiceConnection,

        flags: Int,

        user: UserHandle

        user: UserHandle,

    ): Boolean {

        executor.execute { super.bindServiceAsUser(service, conn, flags, user) }

        return true
@@ -185,7 +181,7 @@ private class ContextWrapperDelayedBind( 
        service: Intent,

        conn: ServiceConnection,

        flags: BindServiceFlags,

        user: UserHandle

        user: UserHandle,

    ): Boolean {

        executor.execute { super.bindServiceAsUser(service, conn, flags, user) }

        return true
@@ -196,7 +192,7 @@ private class ContextWrapperDelayedBind( 
        conn: ServiceConnection?,

        flags: Int,

        handler: Handler?,

        user: UserHandle?

        user: UserHandle?,

    ): Boolean {

        executor.execute { super.bindServiceAsUser(service, conn, flags, handler, user) }

        return true
@@ -207,7 +203,7 @@ private class ContextWrapperDelayedBind( 
        conn: ServiceConnection,

        flags: BindServiceFlags,

        handler: Handler,

        user: UserHandle

        user: UserHandle,

    ): Boolean {

        executor.execute { super.bindServiceAsUser(service, conn, flags, handler, user) }

        return true

packages/SystemUI/multivalentTests/src/com/android/systemui/qs/external/TileServiceManagerTest.java

+2 −42
Original line number Diff line number Diff line
@@ -15,9 +15,6 @@ 
 */

package com.android.systemui.qs.external;



import static android.platform.test.flag.junit.FlagsParameterization.allCombinationsOf;



import static com.android.systemui.Flags.FLAG_QS_CUSTOM_TILE_CLICK_GUARANTEED_BUG_FIX;

import static com.android.systemui.util.concurrency.MockExecutorHandlerKt.mockExecutorHandler;



import static com.google.common.truth.Truth.assertThat;
@@ -41,10 +38,8 @@ import android.content.Intent; 
import android.content.IntentFilter;

import android.os.Handler;

import android.os.UserHandle;

import android.platform.test.annotations.DisableFlags;

import android.platform.test.annotations.EnableFlags;

import android.platform.test.flag.junit.FlagsParameterization;



import androidx.test.ext.junit.runners.AndroidJUnit4;

import androidx.test.filters.SmallTest;



import com.android.systemui.SysuiTestCase;
@@ -62,20 +57,10 @@ import org.mockito.ArgumentCaptor; 
import org.mockito.Mock;

import org.mockito.MockitoAnnotations;



import java.util.List;



import platform.test.runner.parameterized.ParameterizedAndroidJunit4;

import platform.test.runner.parameterized.Parameters;



@SmallTest

@RunWith(ParameterizedAndroidJunit4.class)

@RunWith(AndroidJUnit4.class)

public class TileServiceManagerTest extends SysuiTestCase {



    @Parameters(name = "{0}")

    public static List<FlagsParameterization> getParams() {

        return allCombinationsOf(FLAG_QS_CUSTOM_TILE_CLICK_GUARANTEED_BUG_FIX);

    }



    @Mock

    private TileServices mTileServices;

    @Mock
@@ -94,11 +79,6 @@ public class TileServiceManagerTest extends SysuiTestCase { 
    private TileServiceManager mTileServiceManager;

    private ComponentName mComponentName;



    public TileServiceManagerTest(FlagsParameterization flags) {

        super();

        mSetFlagsRule.setFlagsParameterization(flags);

    }



    @Before

    public void setUp() throws Exception {

        MockitoAnnotations.initMocks(this);
@@ -228,25 +208,6 @@ public class TileServiceManagerTest extends SysuiTestCase { 
    }



    @Test

    @DisableFlags(FLAG_QS_CUSTOM_TILE_CLICK_GUARANTEED_BUG_FIX)

    public void testStopListeningAndUnbindImmediatelyAfterUpdate() {

        when(mTileLifecycle.isActiveTile()).thenReturn(true);

        mTileServiceManager.startLifecycleManagerAndAddTile();

        mTileServiceManager.setBindAllowed(true);

        clearInvocations(mTileLifecycle);



        mTileServiceManager.setBindRequested(true);

        verify(mTileLifecycle).executeSetBindService(true);



        mTileServiceManager.setLastUpdate(0);

        mFakeExecutor.advanceClockToLast();

        mFakeExecutor.runAllReady();

        verify(mTileLifecycle).onStopListening();

        verify(mTileLifecycle).executeSetBindService(false);

    }



    @Test

    @EnableFlags(FLAG_QS_CUSTOM_TILE_CLICK_GUARANTEED_BUG_FIX)

    public void testStopListeningAndUnbindImmediatelyAfterUpdate_ifRequestedFromTileService() {

        when(mTileLifecycle.isActiveTile()).thenReturn(true);

        mTileServiceManager.startLifecycleManagerAndAddTile();
@@ -265,7 +226,6 @@ public class TileServiceManagerTest extends SysuiTestCase { 
    }



    @Test

    @EnableFlags(FLAG_QS_CUSTOM_TILE_CLICK_GUARANTEED_BUG_FIX)

    public void testNotUnbindImmediatelyAfterUpdate_ifRequestedFromSystemUI() {

        when(mTileLifecycle.isActiveTile()).thenReturn(true);

        mTileServiceManager.startLifecycleManagerAndAddTile();

packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/ColorInversionTileTest.java

+2 −3
Original line number Diff line number Diff line
@@ -18,8 +18,6 @@ package com.android.systemui.qs.tiles; 


import static android.platform.test.flag.junit.FlagsParameterization.allCombinationsOf;



import static com.android.systemui.Flags.FLAG_QS_CUSTOM_TILE_CLICK_GUARANTEED_BUG_FIX;



import static com.google.common.truth.Truth.assertThat;



import static org.mockito.ArgumentMatchers.any;
@@ -43,6 +41,7 @@ import com.android.systemui.plugins.qs.QSTile; 
import com.android.systemui.plugins.statusbar.StatusBarStateController;

import com.android.systemui.qs.QSHost;

import com.android.systemui.qs.QsEventLogger;

import com.android.systemui.qs.flags.QSComposeFragment;

import com.android.systemui.qs.flags.QsInCompose;

import com.android.systemui.qs.logging.QSLogger;

import com.android.systemui.qs.shared.QSSettingsPackageRepository;
@@ -75,7 +74,7 @@ public class ColorInversionTileTest extends SysuiTestCase { 


    @Parameters(name = "{0}")

    public static List<FlagsParameterization> getParams() {

        return allCombinationsOf(FLAG_QS_CUSTOM_TILE_CLICK_GUARANTEED_BUG_FIX);

        return allCombinationsOf(QSComposeFragment.FLAG_NAME);

    }



    @Mock

packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/InternetTileTest.java

+4 −5
Original line number Diff line number Diff line
@@ -18,8 +18,6 @@ package com.android.systemui.qs.tiles; 


import static android.platform.test.flag.junit.FlagsParameterization.allCombinationsOf;



import static com.android.systemui.Flags.FLAG_QS_CUSTOM_TILE_CLICK_GUARANTEED_BUG_FIX;



import static com.google.common.truth.Truth.assertThat;



import static org.mockito.ArgumentMatchers.eq;
@@ -43,6 +41,7 @@ import com.android.systemui.plugins.qs.QSTile; 
import com.android.systemui.plugins.statusbar.StatusBarStateController;

import com.android.systemui.qs.QSHost;

import com.android.systemui.qs.QsEventLogger;

import com.android.systemui.qs.flags.QSComposeFragment;

import com.android.systemui.qs.flags.QsInCompose;

import com.android.systemui.qs.logging.QSLogger;

import com.android.systemui.qs.tileimpl.QSTileImpl;
@@ -61,11 +60,11 @@ import org.junit.runner.RunWith; 
import org.mockito.Mock;

import org.mockito.MockitoAnnotations;



import java.util.List;



import platform.test.runner.parameterized.ParameterizedAndroidJunit4;

import platform.test.runner.parameterized.Parameters;



import java.util.List;



@RunWith(ParameterizedAndroidJunit4.class)

@TestableLooper.RunWithLooper(setAsMainLooper = true)

@SmallTest
@@ -73,7 +72,7 @@ public class InternetTileTest extends SysuiTestCase { 


    @Parameters(name = "{0}")

    public static List<FlagsParameterization> getParams() {

        return allCombinationsOf(FLAG_QS_CUSTOM_TILE_CLICK_GUARANTEED_BUG_FIX);

        return allCombinationsOf(QSComposeFragment.FLAG_NAME);

    }



    @Mock

packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/ReduceBrightColorsTileTest.java

+4 −5
Original line number Diff line number Diff line
@@ -18,8 +18,6 @@ package com.android.systemui.qs.tiles; 


import static android.platform.test.flag.junit.FlagsParameterization.allCombinationsOf;



import static com.android.systemui.Flags.FLAG_QS_CUSTOM_TILE_CLICK_GUARANTEED_BUG_FIX;



import static junit.framework.Assert.assertEquals;



import static org.mockito.ArgumentMatchers.any;
@@ -50,6 +48,7 @@ import com.android.systemui.plugins.statusbar.StatusBarStateController; 
import com.android.systemui.qs.QSHost;

import com.android.systemui.qs.QsEventLogger;

import com.android.systemui.qs.ReduceBrightColorsController;

import com.android.systemui.qs.flags.QSComposeFragment;

import com.android.systemui.qs.flags.QsInCompose;

import com.android.systemui.qs.logging.QSLogger;

import com.android.systemui.qs.tileimpl.QSTileImpl;
@@ -63,11 +62,11 @@ import org.junit.runner.RunWith; 
import org.mockito.Mock;

import org.mockito.MockitoAnnotations;



import java.util.List;



import platform.test.runner.parameterized.ParameterizedAndroidJunit4;

import platform.test.runner.parameterized.Parameters;



import java.util.List;



@RunWith(ParameterizedAndroidJunit4.class)

@TestableLooper.RunWithLooper(setAsMainLooper = true)

@SmallTest
@@ -75,7 +74,7 @@ public class ReduceBrightColorsTileTest extends SysuiTestCase { 


    @Parameters(name = "{0}")

    public static List<FlagsParameterization> getParams() {

        return allCombinationsOf(FLAG_QS_CUSTOM_TILE_CLICK_GUARANTEED_BUG_FIX);

        return allCombinationsOf(QSComposeFragment.FLAG_NAME);

    }



    @Mock