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

Commit 69eed5ee authored by Anton Potapov's avatar Anton Potapov Committed by Automerger Merge Worker
Browse files

Merge "Synchronously call callback when load is cancelled" into udc-qpr-dev am: 7ac68504 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23589236



Change-Id: I93b9d83a7e592e77ce8b28d273ddecef722f6afa
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 76985aed 7ac68504

packages/SystemUI/src/com/android/systemui/controls/controller/ControlsBindingControllerImpl.kt

+1 −0
Original line number Diff line number Diff line
@@ -312,6 +312,7 @@ open class ControlsBindingControllerImpl @Inject constructor( 
                Log.d(TAG, "Canceling loadSubscribtion")

                it.invoke()

            }

            callback.error("Load cancelled")

        }



        override fun onSubscribe(token: IBinder, subs: IControlsSubscription) {

packages/SystemUI/tests/src/com/android/systemui/controls/controller/ControlsBindingControllerImplTest.kt

+2 −5
Original line number Diff line number Diff line
@@ -116,11 +116,7 @@ class ControlsBindingControllerImplTest : SysuiTestCase() { 


    @Test

    fun testBindAndLoad_cancel() {

        val callback = object : ControlsBindingController.LoadCallback {

            override fun error(message: String) {}



            override fun accept(t: List<Control>) {}

        }

        val callback = mock(ControlsBindingController.LoadCallback::class.java)

        val subscription = mock(IControlsSubscription::class.java)



        val canceller = controller.bindAndLoad(TEST_COMPONENT_NAME_1, callback)
@@ -130,6 +126,7 @@ class ControlsBindingControllerImplTest : SysuiTestCase() { 


        canceller.run()

        verify(providers[0]).cancelSubscription(subscription)

        verify(callback).error(any())

    }



    @Test