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

Commit 0d78f1dd authored by Nate Myren's avatar Nate Myren
Browse files

Account for removal of perm group in Auto Revoke livedata 

Ensure that the AutoRevokedPackagesLiveData does not crash if the
permission groups of one of the packages it watches becomes invalid

Fixes: 153820270
Test: Replace an app with a version of itself that requests fewer
permissions while the ManageStandardPermissionsFragemnt or AutoRevoke
fragment are open.

Change-Id: I3dce64bc227dd3c07630d58263586ebf5d9428a4
parent dbbc4807

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

+16 −9
Original line number Diff line number Diff line
@@ -106,10 +106,15 @@ object AutoRevokedPackagesLiveData 
        toAdd.forEach { permStateLiveDatas[it] = PermStateLiveData[it] }



        toAdd.forEach { packagePermGroup ->

            val liveData = permStateLiveDatas[packagePermGroup]!!

            addSource(liveData) { permState ->

            val permStateLiveData = permStateLiveDatas[packagePermGroup]!!

            val packageUser = packagePermGroup.first to packagePermGroup.third



            addSource(permStateLiveData) { permState ->

                var added = false

                if (permState == null && permStateLiveData.isInitialized) {

                    permStateLiveDatas.remove(packagePermGroup)

                    removeSource(permStateLiveData)

                } else if (permState != null) {

                    for ((_, state) in permState) {

                        if (state.permFlags and FLAG_PERMISSION_AUTO_REVOKED != 0) {

                            packageAutoRevokedPermsList.getOrPut(packageUser) { mutableSetOf() }
@@ -118,6 +123,8 @@ object AutoRevokedPackagesLiveData 
                            break

                        }

                    }

                }



                if (!added) {

                    packageAutoRevokedPermsList[packageUser]?.remove(packagePermGroup.second)

                    if (packageAutoRevokedPermsList[packageUser]?.isEmpty() == true) {