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

Commit 79baa56b authored by Philip P. Moltmann's avatar Philip P. Moltmann
Browse files

Force-update when running upgradePermissions 

not that it matters in this case as this is always the first thing run
in the process. Also force-update only force-updates a single level of
live-data, not recursively.

Still, mark it as force-update to clearly mark what it supposed to be.

Test: Built
Bug: 150407536
Change-Id: I732d41c302e5aecd03bc41faeae07531406d0213
parent 2638f93d

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

+6 −6
Original line number Diff line number Diff line
@@ -157,7 +157,7 @@ internal object RuntimePermissionsUpgradeController { 
                    if (pkgInfos != null) {

                        removeSource(pkgInfoProvider)



                        onUpdate()

                        updateIfActive()

                    }

                }
@@ -170,7 +170,7 @@ internal object RuntimePermissionsUpgradeController { 
                            platformRuntimePermissionInfoProvidersDone.add(permProvider)

                            removeSource(permProvider)



                            onUpdate()

                            updateIfActive()

                        }

                    }

                }
@@ -179,7 +179,7 @@ internal object RuntimePermissionsUpgradeController { 
                    if (preinstalledPkgInfos != null) {

                        removeSource(preinstalledPkgInfoProvider)



                        onUpdate()

                        updateIfActive()

                    }

                }

            }
@@ -231,14 +231,14 @@ internal object RuntimePermissionsUpgradeController { 
                                permGroupProvidersDone.add(permGroupProvider)

                                removeSource(permGroupProvider)



                                onUpdate()

                                updateIfActive()

                            }

                        }

                    }



                    // If no group need to be loaded, directly switch to third step

                    if (permGroupProviders!!.isEmpty()) {

                        onUpdate()

                        updateIfActive()

                    }

                } else if (permGroupProviders != null &&

                        permGroupProvidersDone.size == permGroupProviders!!.size &&
@@ -280,7 +280,7 @@ internal object RuntimePermissionsUpgradeController { 
        }



        // Trigger loading of data and wait until data is loaded

        val upgradeData = upgradeDataProvider.getInitializedValue()

        val upgradeData = upgradeDataProvider.getInitializedValue(forceUpdate = true)



        // Only whitelist permissions that are in the OTA. Apps that are updated via OTAs are never

        // installed. Hence their permission are never whitelisted. This code replaces that by