diff options
| author | Nate Myren <ntmyren@google.com> | 2023-05-26 23:24:42 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-05-26 23:24:42 +0000 |
| commit | 4bbd0da5514eaf48d3cd7b08cffcacdbb0a2967d (patch) | |
| tree | 9d3da190c458332747a720ffdda2e40f8f14e661 /PermissionController/src/com | |
| parent | f0d5e5c1f9c6ab37a619294d5d8fe43ce5445327 (diff) | |
| parent | 1cf34a8ae41bec8ea981889e692dde659e724ec2 (diff) | |
| download | Permission-4bbd0da5514eaf48d3cd7b08cffcacdbb0a2967d.tar.gz | |
If a stored perm version is higher than latest, reset to latest am: 1cf34a8ae4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Permission/+/23453078
Change-Id: I9d744eb60c45fb178040b1d78c02b6bd040816ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'PermissionController/src/com')
| -rw-r--r-- | PermissionController/src/com/android/permissioncontroller/permission/service/RuntimePermissionsUpgradeController.kt | 10 |
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() |