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

Commit e91637cc authored by Jernej Virag's avatar Jernej Virag
Browse files

Cleanup slice_broadcast_relay_in_background 

Cleans up the flag since the change has been rolled out.

Bug: 409605420
Test: atest SliceBroadcastRelayHandlerTest
Flag: EXEMPT removing slice_broadcast_relay_in_background
Change-Id: Ic4be98999c9b15665687ba93293a285fe98048a7
parent 8fee1444

packages/SystemUI/aconfig/systemui.aconfig

+0 −10
Original line number Diff line number Diff line
@@ -1155,16 +1155,6 @@ flag { 
    }

}



flag {

    name: "slice_broadcast_relay_in_background"

    namespace: "systemui"

    description: "Move handling of slice broadcast relay broadcasts to background threads"

    bug: "334767208"

    metadata {

      purpose: PURPOSE_BUGFIX

    }

}



flag {

    name: "register_battery_controller_receivers_in_corestartable"

    namespace: "systemui"

packages/SystemUI/src/com/android/systemui/SliceBroadcastRelayHandler.java

+1 −8
Original line number Diff line number Diff line
@@ -14,8 +14,6 @@ 


package com.android.systemui;



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



import android.content.BroadcastReceiver;

import android.content.ComponentName;

import android.content.ContentProvider;
@@ -69,12 +67,7 @@ public class SliceBroadcastRelayHandler implements CoreStartable { 
        if (DEBUG) Log.d(TAG, "Start");

        IntentFilter filter = new IntentFilter(SliceBroadcastRelay.ACTION_REGISTER);

        filter.addAction(SliceBroadcastRelay.ACTION_UNREGISTER);



        if (sliceBroadcastRelayInBackground()) {

        mBroadcastDispatcher.registerReceiver(mReceiver, filter, mBackgroundExecutor);

        } else {

            mBroadcastDispatcher.registerReceiver(mReceiver, filter);

        }

    }



    // This does not use BroadcastDispatcher as the filter may have schemas or mime types.

packages/SystemUI/tests/src/com/android/systemui/SliceBroadcastRelayHandlerTest.java

+2 −31
Original line number Diff line number Diff line
@@ -31,10 +31,8 @@ import android.content.Context; 
import android.content.Intent;

import android.content.IntentFilter;

import android.net.Uri;

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.settingslib.SliceBroadcastRelay;
@@ -45,23 +43,14 @@ import com.android.systemui.util.time.FakeSystemClock; 
import org.junit.Before;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.junit.runners.Parameterized;

import org.mockito.ArgumentCaptor;

import org.mockito.Mock;

import org.mockito.MockitoAnnotations;



import java.util.List;



@RunWith(Parameterized.class)

@RunWith(AndroidJUnit4.class)

@SmallTest

public class SliceBroadcastRelayHandlerTest extends SysuiTestCase {



    @Parameterized.Parameters(name = "{0}")

    public static List<FlagsParameterization> getFlags() {

        return FlagsParameterization.allCombinationsOf(

                Flags.FLAG_SLICE_BROADCAST_RELAY_IN_BACKGROUND);

    }



    private static final String TEST_ACTION = "com.android.systemui.action.TEST_ACTION";

    private final FakeExecutor mBackgroundExecutor = new FakeExecutor(new FakeSystemClock());
@@ -70,11 +59,6 @@ public class SliceBroadcastRelayHandlerTest extends SysuiTestCase { 
    @Mock

    private BroadcastDispatcher mBroadcastDispatcher;





    public SliceBroadcastRelayHandlerTest(FlagsParameterization flags) {

        mSetFlagsRule.setFlagsParameterization(flags);

    }



    @Before

    public void setup() {

        MockitoAnnotations.initMocks(this);
@@ -172,19 +156,6 @@ public class SliceBroadcastRelayHandlerTest extends SysuiTestCase { 
    }



    @Test

    @DisableFlags(Flags.FLAG_SLICE_BROADCAST_RELAY_IN_BACKGROUND)

    public void testRegisteredWithDispatcher_onMainThread() {

        mRelayHandler.start();

        mBackgroundExecutor.runAllReady();



        verify(mBroadcastDispatcher)

                .registerReceiver(any(BroadcastReceiver.class), any(IntentFilter.class));

        verify(mSpyContext, never())

                .registerReceiver(any(BroadcastReceiver.class), any(IntentFilter.class));

    }



    @Test

    @EnableFlags(Flags.FLAG_SLICE_BROADCAST_RELAY_IN_BACKGROUND)

    public void testRegisteredWithDispatcher_onBackgroundThread() {

        mRelayHandler.start();

        mBackgroundExecutor.runAllReady();