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

Commit ffbb2fe0 authored by Nate Myren's avatar Nate Myren
Browse files

Make add/removeSource blocking, make source lists sets 

Ensure that add and removeSource complete before returning. Also make
all liveData lists sets, to ensure unique values. Finally, have one
observer for LightPackageInfoLiveData, so that even if it is added
multiple times, it will not throw an error.

Fixes: 156256341
Fixes: 156498596
Test: Flash, ensure service calls and UI do not deadlock

Change-Id: Icff73994782e08d820b88aea5736e6b0dc296f14
parent 3220af70

src/com/android/permissioncontroller/permission/data/LightPackageInfoLiveData.kt

+6 −3
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import android.app.Application 
import android.content.pm.PackageManager

import android.os.UserHandle

import android.util.Log

import androidx.lifecycle.Observer

import com.android.permissioncontroller.PermissionControllerApplication

import com.android.permissioncontroller.permission.model.livedatatypes.LightPackageInfo

import com.android.permissioncontroller.permission.utils.Utils
@@ -108,9 +109,7 @@ class LightPackageInfoLiveData private constructor( 
        }

        if (userPackagesLiveData.hasActiveObservers() && !watchingUserPackagesLiveData) {

            watchingUserPackagesLiveData = true

            addSource(userPackagesLiveData) {

                updateFromUserPackageInfosLiveData()

            }

            addSource(userPackagesLiveData, userPackageInfosObserver)

            if (userPackagesLiveData.isInitialized) {

                // Set our value, but listen for new updates.

                updateFromUserPackageInfosLiveData()
@@ -120,6 +119,10 @@ class LightPackageInfoLiveData private constructor( 
        }

    }



    val userPackageInfosObserver = Observer<List<LightPackageInfo>> {

        updateFromUserPackageInfosLiveData()

    }



    private fun updateFromUserPackageInfosLiveData() {

        val packageInfo = userPackagesLiveData.value!!.find { it.packageName == packageName }

        if (packageInfo != null) {

src/com/android/permissioncontroller/permission/data/PermGroupsPackagesUiInfoLiveData.kt

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ class PermGroupsPackagesUiInfoLiveData( 
    private fun addPermGroupPackagesUiInfoLiveDatas(

        groupNames: Collection<String>

    ) {

        val groupsAdded = mutableListOf<String>()

        val groupsAdded = mutableSetOf<String>()

        for (groupName in groupNames) {

            if (!permGroupPackagesLiveDatas.containsKey(groupName)) {

                groupsAdded.add(groupName)

src/com/android/permissioncontroller/permission/data/SmartUpdateMediatorLiveData.kt

+16 −11
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ import com.android.permissioncontroller.permission.utils.shortStackTrace 
import kotlinx.coroutines.Dispatchers.Main

import kotlinx.coroutines.GlobalScope

import kotlinx.coroutines.launch

import kotlinx.coroutines.runBlocking



/**

 * A MediatorLiveData which tracks how long it has been inactive, compares new values before setting
@@ -146,6 +147,7 @@ abstract class SmartUpdateMediatorLiveData<T> : MediatorLiveData<T>(), 
    }



    override fun <S : Any?> addSource(source: LiveData<S>, onChanged: Observer<in S>) {

        runBlocking {

            GlobalScope.launch(Main.immediate) {

                if (source is SmartUpdateMediatorLiveData) {

                    source.addChild(this@SmartUpdateMediatorLiveData, onChanged,
@@ -155,8 +157,10 @@ abstract class SmartUpdateMediatorLiveData<T> : MediatorLiveData<T>(), 
                super.addSource(source, onChanged)

            }

        }

    }



    override fun <S : Any?> removeSource(toRemote: LiveData<S>) {

        runBlocking {

            GlobalScope.launch(Main.immediate) {

                if (toRemote is SmartUpdateMediatorLiveData) {

                    toRemote.removeChild(this@SmartUpdateMediatorLiveData)
@@ -165,6 +169,7 @@ abstract class SmartUpdateMediatorLiveData<T> : MediatorLiveData<T>(), 
                super.removeSource(toRemote)

            }

        }

    }



    @MainThread

    private fun <S : Any?> removeChild(liveData: LiveData<S>) {

src/com/android/permissioncontroller/permission/utils/KotlinUtils.kt

+3 −3
Original line number Diff line number Diff line
@@ -93,9 +93,9 @@ object KotlinUtils { 
    fun <K> getMapAndListDifferences(

        newValues: List<K>,

        oldValues: Map<K, *>

    ): Pair<List<K>, List<K>> {

        val mapHas = oldValues.keys.toMutableList()

        val listHas = newValues.toMutableList()

    ): Pair<Set<K>, Set<K>> {

        val mapHas = oldValues.keys.toMutableSet()

        val listHas = newValues.toMutableSet()

        for (newVal in newValues) {

            if (oldValues.containsKey(newVal)) {

                mapHas.remove(newVal)