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

Commit 87faa2d9 authored by Alejandro Nijamkin's avatar Alejandro Nijamkin Committed by Automerger Merge Worker
Browse files

Fixes failing CustomizationProviderTest. am: 3528f212 am: 19762ee3 am: 7137d916 

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



Change-Id: I35fd14fd79ae805cf83e1a16fa6f515a96a56336
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2b5f2373 7137d916

packages/SystemUI/src/com/android/systemui/keyguard/CustomizationProvider.kt

+2 −2
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ class CustomizationProvider : 
            throw UnsupportedOperationException()

        }



        return runBlocking { insertSelection(values) }

        return runBlocking(mainDispatcher) { insertSelection(values) }

    }



    override fun query(
@@ -171,7 +171,7 @@ class CustomizationProvider : 
            throw UnsupportedOperationException()

        }



        return runBlocking { deleteSelection(uri, selectionArgs) }

        return runBlocking(mainDispatcher) { deleteSelection(uri, selectionArgs) }

    }



    override fun call(method: String, arg: String?, extras: Bundle?): Bundle? {

packages/SystemUI/tests/src/com/android/systemui/keyguard/CustomizationProviderTest.kt

+1 −2
Original line number Diff line number Diff line
@@ -62,7 +62,6 @@ import com.android.systemui.util.mockito.whenever 
import com.android.systemui.util.settings.FakeSettings

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

import kotlinx.coroutines.ExperimentalCoroutinesApi

import kotlinx.coroutines.test.StandardTestDispatcher

import kotlinx.coroutines.test.TestScope

import kotlinx.coroutines.test.UnconfinedTestDispatcher

import kotlinx.coroutines.test.runTest
@@ -104,7 +103,7 @@ class CustomizationProviderTest : SysuiTestCase() { 
        whenever(backgroundHandler.looper).thenReturn(TestableLooper.get(this).looper)



        underTest = CustomizationProvider()

        val testDispatcher = StandardTestDispatcher()

        val testDispatcher = UnconfinedTestDispatcher()

        testScope = TestScope(testDispatcher)

        val localUserSelectionManager =

            KeyguardQuickAffordanceLocalUserSelectionManager(