Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Synchronously call callback when load is cancelled" into udc-qpr-dev

Browse Source
This commit is contained in:
Anton Potapov
2023-06-06 19:46:40 +00:00
committed by Android (Google) Code Review
parent fd07462020 cdf6067fbc
commit 7ac6850464
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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) {

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

@@ -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