Merge "Remove media_controls_device_manager_background_execution flag" into main (6b58020b) · Commits · e / os / android_frameworks_base

packages/SystemUI/aconfig/systemui.aconfig

+0 −10

Original line number	Diff line number	Diff line
		@@ -1264,16 +1264,6 @@ flag {
		bug: "379044958"
		}

		flag {
		name: "media_controls_device_manager_background_execution"
		namespace: "systemui"
		description: "Sends some instances creation to background thread"
		bug: "400200474"
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}

		flag {
		name: "media_controls_in_compose"
		namespace: "systemui"

packages/SystemUI/src/com/android/systemui/media/controls/domain/pipeline/MediaDeviceManager.kt

+4 −21

Original line number	Diff line number	Diff line
		@@ -40,7 +40,6 @@ import com.android.settingslib.media.MediaDevice
		import com.android.settingslib.media.PhoneMediaDevice
		import com.android.settingslib.media.flags.Flags
		import com.android.systemui.Flags.enableSuggestedDeviceUi
		import com.android.systemui.Flags.mediaControlsDeviceManagerBackgroundExecution
		import com.android.systemui.dagger.qualifiers.Background
		import com.android.systemui.dagger.qualifiers.Main
		import com.android.systemui.media.controls.shared.MediaControlDrawables
		@@ -100,19 +99,11 @@ constructor(
		data: MediaData,
		immediately: Boolean,
		) {
		if (mediaControlsDeviceManagerBackgroundExecution()) {
		bgExecutor.execute { onMediaLoaded(key, oldKey, data) }
		} else {
		onMediaLoaded(key, oldKey, data)
		}
		}

		override fun onMediaDataRemoved(key: String, userInitiated: Boolean) {
		if (mediaControlsDeviceManagerBackgroundExecution()) {
		bgExecutor.execute { onMediaRemoved(key, userInitiated) }
		} else {
		onMediaRemoved(key, userInitiated)
		}
		}

		fun dump(pw: PrintWriter) {
		@@ -141,11 +132,7 @@ constructor(
		if (data.device != null) {
		// If we were already provided device info (e.g. from RCN), keep that and
		// don't listen for updates, but process once to push updates to listeners
		if (mediaControlsDeviceManagerBackgroundExecution()) {
		fgExecutor.execute { processDevice(key, oldKey, data.device) }
		} else {
		processDevice(key, oldKey, data.device)
		}
		return
		}
		val controller = data.token?.let { controllerFactory.create(it) }
		@@ -162,13 +149,9 @@ constructor(
		private fun onMediaRemoved(key: String, userInitiated: Boolean) {
		val token = entries.remove(key)
		token?.stop()
		if (mediaControlsDeviceManagerBackgroundExecution()) {
		fgExecutor.execute {
		token?.let { listeners.forEach { it.onKeyRemoved(key, userInitiated) } }
		}
		} else {
		token?.let { listeners.forEach { it.onKeyRemoved(key, userInitiated) } }
		}
		}

		@MainThread

packages/SystemUI/tests/src/com/android/systemui/media/controls/domain/pipeline/MediaDeviceManagerTest.kt

+4 −18

Original line number	Diff line number	Diff line
		@@ -33,8 +33,8 @@ import android.platform.test.annotations.DisableFlags
		import android.platform.test.annotations.EnableFlags
		import android.platform.test.annotations.RequiresFlagsEnabled
		import android.platform.test.flag.junit.DeviceFlagsValueProvider
		import android.platform.test.flag.junit.FlagsParameterization
		import android.testing.TestableLooper
		import androidx.test.ext.junit.runners.AndroidJUnit4
		import androidx.test.filters.SmallTest
		import com.android.settingslib.bluetooth.LocalBluetoothLeBroadcast
		import com.android.settingslib.bluetooth.LocalBluetoothManager
		@@ -79,8 +79,6 @@ import org.mockito.Mockito.verifyNoMoreInteractions
		import org.mockito.Mockito.`when` as whenever
		import org.mockito.junit.MockitoJUnit
		import org.mockito.kotlin.eq
		import platform.test.runner.parameterized.ParameterizedAndroidJunit4
		import platform.test.runner.parameterized.Parameters

		private const val KEY = "TEST_KEY"
		private const val KEY_OLD = "TEST_KEY_OLD"
		@@ -93,24 +91,12 @@ private const val BROADCAST_APP_NAME = "BROADCAST_APP_NAME"
		private const val NORMAL_APP_NAME = "NORMAL_APP_NAME"

		@SmallTest
		@RunWith(ParameterizedAndroidJunit4::class)
		@RunWith(AndroidJUnit4::class)
		@TestableLooper.RunWithLooper
		public class MediaDeviceManagerTest(flags: FlagsParameterization) : SysuiTestCase() {
		public class MediaDeviceManagerTest : SysuiTestCase() {

		companion object {
		private companion object {
		val OTHER_DEVICE_ICON_STUB = TestStubDrawable()

		@JvmStatic
		@Parameters(name = "{0}")
		fun getParams(): List<FlagsParameterization> {
		return FlagsParameterization.progressionOf(
		com.android.systemui.Flags.FLAG_MEDIA_CONTROLS_DEVICE_MANAGER_BACKGROUND_EXECUTION
		)
		}
		}

		init {
		mSetFlagsRule.setFlagsParameterization(flags)
		}

		@get:Rule val checkFlagsRule = DeviceFlagsValueProvider.createCheckFlagsRule()