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

Commit e64533c0 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "fix FileNotFound exception when attempting to read bubble xml" into rvc-dev am: 750b4c93

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

Change-Id: I6fcd3eef93029606b28dda33c7c2632076b99368
parents 1e3ecbb4 750b4c93
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ class BubblePersistentRepository @Inject constructor(

    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)
            }
+7 −0
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@ import android.testing.AndroidTestingRunner
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
@@ -42,6 +44,11 @@ class BubblePersistentRepositoryTest : SysuiTestCase() {

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