Merge "Merge "fix FileNotFound exception when attempting to read bubble xml"...

    fun readFromDisk(): List<BubbleEntity> {

        synchronized(bubbleFile) {

            if (!bubbleFile.exists()) return emptyList()

            try { return bubbleFile.openRead().use(::readXml) } catch (e: Throwable) {

                Log.e(TAG, "Failed to open bubble file", e)

            }

import androidx.test.filters.SmallTest

import com.android.systemui.SysuiTestCase

import junit.framework.Assert.assertEquals

import junit.framework.Assert.assertNotNull

import junit.framework.Assert.assertTrue

import org.junit.Before

import org.junit.Test

import org.junit.runner.RunWith

    @Test

    fun testReadWriteOperation() {

        // Verify read before write doesn't cause FileNotFoundException

        val actual = repository.readFromDisk()

        assertNotNull(actual)

        assertTrue(actual.isEmpty())

        repository.persistsToDisk(bubbles)

        assertEquals(bubbles, repository.readFromDisk())

    }