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

Commit 42d52e4d authored by Nate Myren's avatar Nate Myren Committed by mse1969
Browse files

[BACKPORT] Update RuntimePermissionsUpgradeController to accept null PermGroups 

Now that PermStateLiveData can return invalid, the upgrade controller
needs to handle that.

Test: atest RuntimePermissionsUpgradeControllerTest
Bug: 435737668
Relnote: N/A
Flag: EXEMPT CVE_FIX
Low-Coverage-Reason: security fix
(cherry picked from commit 8895a86cf0feb0f05831acee614e44b4eae9970f)
Cherrypick-From: https://googleplex-android-review.googlesource.com/q/commit:4d05d29833d2d1a0b15243cc12c37bb3b466f177
Merged-In: I4e85931d1c8c865694339528265c735cef93dc01
Change-Id: I4e85931d1c8c865694339528265c735cef93dc01
parent 4f9aad5f

src/com/android/permissioncontroller/permission/service/RuntimePermissionsUpgradeController.kt

+1 −1
Original line number Diff line number Diff line
@@ -234,7 +234,7 @@ internal object RuntimePermissionsUpgradeController { 
                    // Wait until groups are loaded and then trigger third step

                    for (permGroupProvider in permGroupProviders!!) {

                        addSource(permGroupProvider) { group ->

                            if (group != null) {

                            if (group != null || !permGroupProvider.isStale) {

                                permGroupProvidersDone.add(permGroupProvider)

                                removeSource(permGroupProvider)