If a stored perm version is higher than latest, reset to latest

This affects any droidfood users affected by a need to revert the
permissions database version

Fixes: 283303329
Test: maunual
Change-Id: Ide7a8aec25a70c0f0bc5c9ffc1837f5f09eeade1

1 files changed, 5 insertions, 5 deletions

diff --git a/PermissionController/src/com/android/permissioncontroller/permission/service/RuntimePermissionsUpgradeController.kt b/PermissionController/src/com/android/permissioncontroller/permission/service/RuntimePermissionsUpgradeController.kt
index 97f817cff..3405ab014 100644
--- a/PermissionController/src/com/android/permissioncontroller/permission/service/RuntimePermissionsUpgradeController.kt
+++ b/PermissionController/src/com/android/permissioncontroller/permission/service/RuntimePermissionsUpgradeController.kt
@@ -63,19 +63,19 @@ internal object RuntimePermissionsUpgradeController {
 
     fun upgradeIfNeeded(context: Context, onComplete: Runnable) {
         val permissionManager = context.getSystemService(PermissionManager::class.java)
-        val currentVersion = permissionManager!!.runtimePermissionsVersion
+        val storedVersion = permissionManager!!.runtimePermissionsVersion
+        val currentVersion = minOf(storedVersion, LATEST_VERSION)
 
         GlobalScope.launch(IPC) {
             val upgradedVersion = onUpgradeLocked(context, currentVersion)
             if (upgradedVersion != LATEST_VERSION) {
                 Log.wtf("PermissionControllerService", "warning: upgrading permission database" +
-                    " to version " + LATEST_VERSION + " left it at " + currentVersion +
-                    " instead; this is probably a bug. Did you update " +
-                    "LATEST_VERSION?", Throwable())
+                    " to version $LATEST_VERSION left it at $currentVersion instead; this is " +
+                    "probably a bug. Did you update LATEST_VERSION?", Throwable())
                 throw RuntimeException("db upgrade error")
             }
 
-            if (currentVersion != upgradedVersion) {
+            if (storedVersion != upgradedVersion) {
                 permissionManager.runtimePermissionsVersion = LATEST_VERSION
             }
             onComplete.run()