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

Commit c112e3cb 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... 

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

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

Change-Id: Ie28cdfff1abc25431e6429778f5a15952b53173a
parents 050df5e9 64d88bc3

packages/SystemUI/src/com/android/systemui/bubbles/storage/BubblePersistentRepository.kt

+1 −0
Original line number Original line Diff line number Diff line
@@ -54,6 +54,7 @@ class BubblePersistentRepository @Inject constructor( 




    fun readFromDisk(): List<BubbleEntity> {

    fun readFromDisk(): List<BubbleEntity> {

        synchronized(bubbleFile) {

        synchronized(bubbleFile) {

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

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

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

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

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

            }

            }

packages/SystemUI/tests/src/com/android/systemui/bubbles/storage/BubblePersistentRepositoryTest.kt

+7 −0
Original line number Original line Diff line number Diff line
@@ -20,6 +20,8 @@ import android.testing.AndroidTestingRunner 
import androidx.test.filters.SmallTest

import androidx.test.filters.SmallTest

import com.android.systemui.SysuiTestCase

import com.android.systemui.SysuiTestCase

import junit.framework.Assert.assertEquals

import junit.framework.Assert.assertEquals

import junit.framework.Assert.assertNotNull

import junit.framework.Assert.assertTrue

import org.junit.Before

import org.junit.Before

import org.junit.Test

import org.junit.Test

import org.junit.runner.RunWith

import org.junit.runner.RunWith
@@ -42,6 +44,11 @@ class BubblePersistentRepositoryTest : SysuiTestCase() { 




    @Test

    @Test

    fun testReadWriteOperation() {

    fun testReadWriteOperation() {

        // Verify read before write doesn't cause FileNotFoundException

        val actual = repository.readFromDisk()

        assertNotNull(actual)

        assertTrue(actual.isEmpty())



        repository.persistsToDisk(bubbles)

        repository.persistsToDisk(bubbles)

        assertEquals(bubbles, repository.readFromDisk())

        assertEquals(bubbles, repository.readFromDisk())

    }

    }