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

Commit 400d4b16 authored by Matt Pietal's avatar Matt Pietal Committed by Automerger Merge Worker
Browse files

[DO NOT MERGE] Smartspace - Don't create session ahead of init am: 076aad91 

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

Change-Id: I1783a19f1549b50c2ff054ae69ff7cc5991b5eee
parents 6cd2f558 076aad91

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

+1 −2
Original line number Diff line number Diff line
@@ -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
@@ -192,7 +191,7 @@ class LockscreenSmartspaceController @Inject constructor( 
    }



    private fun connectSession() {

        if (plugin == null || session != null) {

        if (plugin == null || session != null || !this::smartspaceView.isInitialized) {

            return

        }

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

+14 −0
Original line number Diff line number Diff line
@@ -458,6 +458,20 @@ class LockscreenSmartspaceControllerTest : SysuiTestCase() { 
        assertEquals(fakeSmartspaceView, controller.view)

    }



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

        controller.buildAndConnectView(fakeParent)