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

Commit 62fd6df7 authored by Evan Severson's avatar Evan Severson Committed by Automerger Merge Worker
Browse files

Merge "Update FgsManager UI information on bg thread without lock" into... 

Merge "Update FgsManager UI information on bg thread without lock" into udc-dev am: a235daba am: f647f3d4

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



Change-Id: If0e3e7ce52fc59740388d1381bbfd5979629df8f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5ab401cd f647f3d4

packages/SystemUI/src/com/android/systemui/qs/FgsManagerController.kt

+41 −17
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ import android.widget.ImageView 
import android.widget.TextView

import androidx.annotation.GuardedBy

import androidx.annotation.VisibleForTesting

import androidx.annotation.WorkerThread

import androidx.recyclerview.widget.DiffUtil

import androidx.recyclerview.widget.LinearLayoutManager

import androidx.recyclerview.widget.RecyclerView
@@ -201,7 +202,7 @@ class FgsManagerControllerImpl @Inject constructor( 
    @GuardedBy("lock")

    private val appListAdapter: AppListAdapter = AppListAdapter()



    @GuardedBy("lock")

    /* Only mutate on the background thread */

    private var runningApps: ArrayMap<UserPackage, RunningApp> = ArrayMap()



    private val userTrackerCallback = object : UserTracker.Callback {
@@ -374,11 +375,6 @@ class FgsManagerControllerImpl @Inject constructor( 
    override fun showDialog(expandable: Expandable?) {

        synchronized(lock) {

            if (dialog == null) {



                runningTaskIdentifiers.keys.forEach {

                    it.updateUiControl()

                }



                val dialog = SystemUIDialog(context)

                dialog.setTitle(R.string.fgs_manager_dialog_title)

                dialog.setMessage(R.string.fgs_manager_dialog_message)
@@ -421,33 +417,53 @@ class FgsManagerControllerImpl @Inject constructor( 
                    }

                }



                backgroundExecutor.execute {

                    synchronized(lock) {

                        updateAppItemsLocked()

                    }

                }

                updateAppItemsLocked(refreshUiControls = true)

            }

        }

    }



    @GuardedBy("lock")

    private fun updateAppItemsLocked() {

    private fun updateAppItemsLocked(refreshUiControls: Boolean = false) {

        if (dialog == null) {

            runningApps.clear()

            backgroundExecutor.execute {

                clearRunningApps()

            }

            return

        }



        val addedPackages = runningTaskIdentifiers.keys.filter {

            currentProfileIds.contains(it.userId) &&

        val packagesToStartTime = runningTaskIdentifiers.mapValues { it.value.startTime }

        val profileIds = currentProfileIds.toSet()

        backgroundExecutor.execute {

            updateAppItems(packagesToStartTime, profileIds, refreshUiControls)

        }

    }



    /**

     * Must be called on the background thread.

     */

    @WorkerThread

    private fun updateAppItems(

        packages: Map<UserPackage, Long>,

        profileIds: Set<Int>,

        refreshUiControls: Boolean = true

    ) {

        if (refreshUiControls) {

            packages.forEach { (pkg, _) ->

                pkg.updateUiControl()

            }

        }



        val addedPackages = packages.keys.filter {

            profileIds.contains(it.userId) &&

                    it.uiControl != UIControl.HIDE_ENTRY && runningApps[it]?.stopped != true

        }

        val removedPackages = runningApps.keys.filter { !runningTaskIdentifiers.containsKey(it) }

        val removedPackages = runningApps.keys.filter { it !in packages }



        addedPackages.forEach {

            val ai = packageManager.getApplicationInfoAsUser(it.packageName, 0, it.userId)

            runningApps[it] = RunningApp(

                it.userId, it.packageName,

                runningTaskIdentifiers[it]!!.startTime, it.uiControl,

                packages[it]!!, it.uiControl,

                packageManager.getApplicationLabel(ai),

                packageManager.getUserBadgedIcon(

                    packageManager.getApplicationIcon(ai), UserHandle.of(it.userId)
@@ -472,6 +488,14 @@ class FgsManagerControllerImpl @Inject constructor( 
        }

    }



    /**

     * Must be called on the background thread.

     */

    @WorkerThread

    private fun clearRunningApps() {

        runningApps.clear()

    }



    private fun stopPackage(userId: Int, packageName: String, timeStarted: Long) {

        logEvent(stopped = true, packageName, userId, timeStarted)

        val userPackageKey = UserPackage(userId, packageName)