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

Commit 4a5f6a23 authored by Priyanka Advani's avatar Priyanka Advani
Browse files

Revert "Add ANC data and domain." 

Revert submission 26232405-volume_panel_anc_ui

Reason for revert: Build breakage b/326133369. 

Reverted changes: /q/submissionid:26232405-volume_panel_anc_ui

Change-Id: Ib6ba0e6c3c99e707953b3abbb46d4ce1de0801f8
parent b2bf367d

packages/SystemUI/multivalentTests/src/com/android/systemui/volume/panel/component/anc/data/repository/AncSliceRepositoryTest.kt

deleted100644 → 0
+0 −114
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2024 The Android Open Source Project

 *

 *  Licensed under the Apache License, Version 2.0 (the "License");

 *  you may not use this file except in compliance with the License.

 *  You may obtain a copy of the License at

 *

 *       http://www.apache.org/licenses/LICENSE-2.0

 *

 *  Unless required by applicable law or agreed to in writing, software

 *  distributed under the License is distributed on an "AS IS" BASIS,

 *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 *  See the License for the specific language governing permissions and

 *  limitations under the License.

 */



package com.android.systemui.volume.panel.component.anc.data.repository



import android.bluetooth.BluetoothDevice

import android.net.Uri

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

import androidx.test.filters.SmallTest

import com.android.settingslib.bluetooth.CachedBluetoothDevice

import com.android.settingslib.media.BluetoothMediaDevice

import com.android.settingslib.media.MediaDevice

import com.android.systemui.SysuiTestCase

import com.android.systemui.coroutines.collectLastValue

import com.android.systemui.kosmos.testScope

import com.android.systemui.testKosmos

import com.android.systemui.util.mockito.any

import com.android.systemui.util.mockito.mock

import com.android.systemui.util.mockito.whenever

import com.android.systemui.volume.localMediaRepository

import com.android.systemui.volume.localMediaRepositoryFactory

import com.android.systemui.volume.panel.component.anc.FakeSliceFactory

import com.android.systemui.volume.panel.component.anc.sliceViewManager

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

import kotlinx.coroutines.ExperimentalCoroutinesApi

import kotlinx.coroutines.test.runCurrent

import kotlinx.coroutines.test.runTest

import org.junit.Before

import org.junit.Test

import org.junit.runner.RunWith



@OptIn(ExperimentalCoroutinesApi::class)

@SmallTest

@RunWith(AndroidJUnit4::class)

class AncSliceRepositoryTest : SysuiTestCase() {



    private val kosmos = testKosmos()



    private lateinit var underTest: AncSliceRepository



    @Before

    fun setup() {

        with(kosmos) {

            val slice = FakeSliceFactory.createSlice(hasError = false, hasSliceItem = true)

            whenever(sliceViewManager.bindSlice(any<Uri>())).thenReturn(slice)



            underTest =

                AncSliceRepositoryImpl(

                    localMediaRepositoryFactory,

                    testScope.testScheduler,

                    sliceViewManager,

                )

        }

    }



    @Test

    fun noConnectedDevice_noSlice() {

        with(kosmos) {

            testScope.runTest {

                localMediaRepository.updateCurrentConnectedDevice(null)



                val slice by collectLastValue(underTest.ancSlice(1))

                runCurrent()



                assertThat(slice).isNull()

            }

        }

    }



    @Test

    fun connectedDevice_sliceReturned() {

        with(kosmos) {

            testScope.runTest {

                localMediaRepository.updateCurrentConnectedDevice(createMediaDevice())



                val slice by collectLastValue(underTest.ancSlice(1))

                runCurrent()



                assertThat(slice).isNotNull()

            }

        }

    }



    private fun createMediaDevice(sliceUri: String = "content://test.slice"): MediaDevice {

        val bluetoothDevice: BluetoothDevice = mock {

            whenever(getMetadata(any()))

                .thenReturn(

                    ("<HEARABLE_CONTROL_SLICE_WITH_WIDTH>" +

                            sliceUri +

                            "</HEARABLE_CONTROL_SLICE_WITH_WIDTH>")

                        .toByteArray()

                )

        }

        val cachedBluetoothDevice: CachedBluetoothDevice = mock {

            whenever(device).thenReturn(bluetoothDevice)

        }

        return mock<BluetoothMediaDevice> {

            whenever(cachedDevice).thenReturn(cachedBluetoothDevice)

        }

    }

}

packages/SystemUI/multivalentTests/src/com/android/systemui/volume/panel/component/anc/domain/AncAvailabilityCriteriaTest.kt

deleted100644 → 0
+0 −89
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2024 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.systemui.volume.panel.component.anc.domain



import android.net.Uri

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

import androidx.test.filters.SmallTest

import com.android.systemui.SysuiTestCase

import com.android.systemui.coroutines.collectLastValue

import com.android.systemui.kosmos.testScope

import com.android.systemui.testKosmos

import com.android.systemui.util.mockito.any

import com.android.systemui.util.mockito.mock

import com.android.systemui.util.mockito.whenever

import com.android.systemui.volume.panel.component.anc.FakeSliceFactory

import com.android.systemui.volume.panel.component.anc.ancSliceInteractor

import com.android.systemui.volume.panel.component.anc.ancSliceRepository

import com.android.systemui.volume.panel.component.anc.sliceViewManager

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

import kotlinx.coroutines.ExperimentalCoroutinesApi

import kotlinx.coroutines.test.runCurrent

import kotlinx.coroutines.test.runTest

import org.junit.Before

import org.junit.Test

import org.junit.runner.RunWith



@OptIn(ExperimentalCoroutinesApi::class)

@SmallTest

@RunWith(AndroidJUnit4::class)

class AncAvailabilityCriteriaTest : SysuiTestCase() {



    private val kosmos = testKosmos()



    private lateinit var underTest: AncAvailabilityCriteria



    @Before

    fun setup() {

        with(kosmos) {

            whenever(sliceViewManager.bindSlice(any<Uri>())).thenReturn(mock {})



            underTest = AncAvailabilityCriteria(ancSliceInteractor)

        }

    }



    @Test

    fun noSlice_unavailable() {

        with(kosmos) {

            testScope.runTest {

                ancSliceRepository.putSlice(1, null)



                val isAvailable by collectLastValue(underTest.isAvailable())

                runCurrent()



                assertThat(isAvailable).isFalse()

            }

        }

    }



    @Test

    fun hasSlice_available() {

        with(kosmos) {

            testScope.runTest {

                ancSliceRepository.putSlice(

                    1,

                    FakeSliceFactory.createSlice(hasError = false, hasSliceItem = true)

                )



                val isAvailable by collectLastValue(underTest.isAvailable())

                runCurrent()



                assertThat(isAvailable).isTrue()

            }

        }

    }

}

packages/SystemUI/multivalentTests/src/com/android/systemui/volume/panel/component/anc/domain/interactor/AncSliceInteractorTest.kt

deleted100644 → 0
+0 −101
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2024 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.systemui.volume.panel.component.anc.domain.interactor



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

import androidx.test.filters.SmallTest

import com.android.systemui.SysuiTestCase

import com.android.systemui.coroutines.collectLastValue

import com.android.systemui.kosmos.testScope

import com.android.systemui.testKosmos

import com.android.systemui.volume.panel.component.anc.FakeSliceFactory

import com.android.systemui.volume.panel.component.anc.ancSliceRepository

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

import kotlinx.coroutines.ExperimentalCoroutinesApi

import kotlinx.coroutines.test.runCurrent

import kotlinx.coroutines.test.runTest

import org.junit.Before

import org.junit.Test

import org.junit.runner.RunWith



@OptIn(ExperimentalCoroutinesApi::class)

@SmallTest

@RunWith(AndroidJUnit4::class)

class AncSliceInteractorTest : SysuiTestCase() {



    private val kosmos = testKosmos()



    private lateinit var underTest: AncSliceInteractor



    @Before

    fun setup() {

        with(kosmos) {

            underTest = AncSliceInteractor(ancSliceRepository, testScope.backgroundScope)

        }

    }



    @Test

    fun errorSlice_returnsNull() {

        with(kosmos) {

            testScope.runTest {

                ancSliceRepository.putSlice(

                    1,

                    FakeSliceFactory.createSlice(hasError = true, hasSliceItem = true)

                )



                val slice by collectLastValue(underTest.ancSlice)

                runCurrent()



                assertThat(slice).isNull()

            }

        }

    }



    @Test

    fun noSliceItem_returnsNull() {

        with(kosmos) {

            testScope.runTest {

                ancSliceRepository.putSlice(

                    1,

                    FakeSliceFactory.createSlice(hasError = false, hasSliceItem = false)

                )



                val slice by collectLastValue(underTest.ancSlice)

                runCurrent()



                assertThat(slice).isNull()

            }

        }

    }



    @Test

    fun sliceItem_noError_returnsSlice() {

        with(kosmos) {

            testScope.runTest {

                ancSliceRepository.putSlice(

                    1,

                    FakeSliceFactory.createSlice(hasError = false, hasSliceItem = true)

                )



                val slice by collectLastValue(underTest.ancSlice)

                runCurrent()



                assertThat(slice).isNotNull()

            }

        }

    }

}

packages/SystemUI/src/com/android/systemui/volume/dagger/AncModule.kt

deleted100644 → 0
+0 −40
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2024 The Android Open Source Project

 *

 *  Licensed under the Apache License, Version 2.0 (the "License");

 *  you may not use this file except in compliance with the License.

 *  You may obtain a copy of the License at

 *

 *       http://www.apache.org/licenses/LICENSE-2.0

 *

 *  Unless required by applicable law or agreed to in writing, software

 *  distributed under the License is distributed on an "AS IS" BASIS,

 *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 *  See the License for the specific language governing permissions and

 *  limitations under the License.

 */



package com.android.systemui.volume.dagger



import android.content.Context

import androidx.slice.SliceViewManager

import com.android.systemui.dagger.SysUISingleton

import com.android.systemui.dagger.qualifiers.Application

import com.android.systemui.volume.panel.component.anc.data.repository.AncSliceRepository

import com.android.systemui.volume.panel.component.anc.data.repository.AncSliceRepositoryImpl

import dagger.Module

import dagger.Provides



/** Dagger module that provides ANC controlling backend. */

@Module

interface AncModule {



    companion object {

        @Provides

        @SysUISingleton

        fun provideAncSliceRepository(

            @Application context: Context,

            implFactory: AncSliceRepositoryImpl.Factory

        ): AncSliceRepository = implFactory.create(SliceViewManager.getInstance(context))

    }

}

packages/SystemUI/src/com/android/systemui/volume/dagger/VolumeModule.java

+0 −1
Original line number Diff line number Diff line
@@ -57,7 +57,6 @@ import dagger.multibindings.IntoSet; 
@Module(

        includes = {

                AudioModule.class,

                AncModule.class,

                CaptioningModule.class,

                MediaDevicesModule.class

        },