Merge "Clean up use_volume_controller flag" into main (e129bd7d) · Commits · e / os / android_frameworks_base

packages/SettingsLib/src/com/android/settingslib/volume/data/repository/AudioRepository.kt

+2 −10

Original line number	Diff line number	Diff line
		@@ -83,8 +83,6 @@ interface AudioRepository {
		/** Events from [AudioManager.setVolumeController] */
		val volumeControllerEvents: Flow<VolumeControllerEvent>

		fun init()

		/** State of the [AudioStream]. */
		fun getAudioStream(audioStream: AudioStream): Flow<AudioStreamModel>

		@@ -116,7 +114,6 @@ class AudioRepositoryImpl(
		private val backgroundCoroutineContext: CoroutineContext,
		private val coroutineScope: CoroutineScope,
		private val logger: AudioLogger,
		shouldUseVolumeController: Boolean,
		) : AudioRepository {

		private val volumeController = ProducingVolumeController()
		@@ -133,12 +130,7 @@ class AudioRepositoryImpl(
		AudioStream(AudioManager.STREAM_ASSISTANT) to Settings.System.VOLUME_ASSISTANT,
		)

		override val volumeControllerEvents: Flow<VolumeControllerEvent> =
		if (shouldUseVolumeController) {
		volumeController.events
		} else {
		emptyFlow()
		}
		override val volumeControllerEvents: Flow<VolumeControllerEvent> = volumeController.events

		override val mode: StateFlow<Int> =
		callbackFlow {
		@@ -183,7 +175,7 @@ class AudioRepositoryImpl(
		audioManager.communicationDevice,
		)

		override fun init() {
		init {
		try {
		audioManager.volumeController = volumeController
		} catch (error: SecurityException) {

+0 −24

Original line number	Diff line number	Diff line
		@@ -44,7 +44,6 @@ import org.mockito.ArgumentMatchers.anyBoolean
		import org.mockito.ArgumentMatchers.anyInt
		import org.mockito.Captor
		import org.mockito.Mock
		import org.mockito.Mockito.never
		import org.mockito.Mockito.verify
		import org.mockito.Mockito.`when`
		import org.mockito.MockitoAnnotations
		@@ -118,7 +117,6 @@ class AudioRepositoryTest {
		testScope.testScheduler,
		testScope.backgroundScope,
		logger,
		true,
		)
		}

		@@ -202,7 +200,6 @@ class AudioRepositoryTest {
		"onVolumeUpdateReceived audioStream=STREAM_SYSTEM",
		"onSetVolumeRequested audioStream=STREAM_SYSTEM",
		"onVolumeUpdateReceived audioStream=STREAM_SYSTEM",
		"onVolumeUpdateReceived audioStream=STREAM_SYSTEM",
		)
		)
		assertThat(streamModel)
		@@ -292,27 +289,6 @@ class AudioRepositoryTest {
		}
		}

		@Test
		fun useVolumeControllerDisabled_setVolumeController_notCalled() {
		testScope.runTest {
		underTest =
		AudioRepositoryImpl(
		eventsReceiver,
		audioManager,
		contentResolver,
		testScope.testScheduler,
		testScope.backgroundScope,
		logger,
		false,
		)

		underTest.volumeControllerEvents.launchIn(backgroundScope)
		runCurrent()

		verify(audioManager, never()).volumeController = any()
		}
		}

		private fun triggerConnectedDeviceChange(communicationDevice: AudioDeviceInfo?) {
		verify(audioManager)
		.addOnCommunicationDeviceChangedListener(

+0 −1

Original line number	Diff line number	Diff line
		@@ -66,7 +66,6 @@ class AudioRepositoryVolumeControllerEventsTest {
		testScope.testScheduler,
		testScope.backgroundScope,
		logger,
		true,
		)
		}

+0 −10

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

		flag {
		name: "use_volume_controller"
		namespace: "systemui"
		description: "Adds Volume Controller signals to the AudioRepository to update volume"
		bug: "349348461"
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}

		flag {
		name: "volume_redesign"
		namespace: "systemui"

+0 −6

Original line number	Diff line number	Diff line
		@@ -28,7 +28,6 @@ import com.android.systemui.volume.data.repository.audioRepository
		import kotlinx.coroutines.flow.MutableStateFlow
		import kotlinx.coroutines.test.runCurrent
		import kotlinx.coroutines.test.runTest
		import org.junit.Before
		import org.junit.Test
		import org.junit.runner.RunWith
		import org.mockito.kotlin.eq
		@@ -46,11 +45,6 @@ class VolumeControllerAdapterTest : SysuiTestCase() {

		private val volumeController = mock<IVolumeController> {}

		@Before
		fun setUp() {
		kosmos.audioRepository.init()
		}

		@Test
		fun volumeControllerEvent_volumeChanged_callsMethod() =
		testEvent(VolumeControllerEvent.VolumeChanged(3, 0)) {