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

Merge "Smartspace - Don't create session ahead of init"

Browse Source
This commit is contained in:
TreeHugger Robot
2021-10-19 20:22:07 +00:00
committed by Android (Google) Code Review
parent fede8852fd 292f414931
commit f568c192e2
2 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SystemUI/src/com/android/systemui/statusbar/lockscreen/LockscreenSmartspaceController.kt
View File

@@ -24,7 +24,6 @@ import android.app.smartspace.SmartspaceTarget
import android.content.ContentResolver
import android.content.Context
import android.content.Intent
import android.content.pm.UserInfo
import android.database.ContentObserver
import android.net.Uri
import android.os.Handler
@@ -203,7 +202,7 @@ class LockscreenSmartspaceController @Inject constructor(
}
private fun connectSession() {
if (plugin == null || session != null) {
if (plugin == null || session != null || smartspaceViews.isEmpty()) {
return
}

14
packages/SystemUI/tests/src/com/android/systemui/statusbar/lockscreen/LockscreenSmartspaceControllerTest.kt
View File

@@ -448,6 +448,20 @@ class LockscreenSmartspaceControllerTest : SysuiTestCase() {
verify(smartspaceView2).registerDataProvider(plugin)
}
@Test
fun testConnectAttemptBeforeInitializationShouldNotCreateSession() {
// GIVEN an uninitalized smartspaceView
// WHEN the device is provisioned
`when`(deviceProvisionedController.isDeviceProvisioned()).thenReturn(true)
`when`(deviceProvisionedController.isCurrentUserSetup()).thenReturn(true)
deviceProvisionedListener.onDeviceProvisionedChanged()
// THEN no calls to createSmartspaceSession should occur
verify(smartspaceManager, never()).createSmartspaceSession(any())
// THEN no listeners should be registered
verify(configurationController, never()).addCallback(any())
}
private fun connectSession() {
val view = controller.buildAndConnectView(fakeParent)
smartspaceView = view as SmartspaceView