From 78b6a561f458ecb04223e78076d70c2b3078abf0 Mon Sep 17 00:00:00 2001 From: Abodunrinwa Toki Date: Wed, 19 Apr 2017 22:00:34 +0100 Subject: [PATCH] SmartSelection ConfigUpdater: Ignore version numbers These model files are updated when the user changes the device language. When this happens, there is no guarantee that the new model file (e.g. in English) has a higher version number than the old model file (e.g. in Italian). Test: none Bug: 34780396 Change-Id: Ida70c5cd85fe246d4085a299711ad8838dafa1e9 --- .../android/server/updates/ConfigUpdateInstallReceiver.java | 2 +- .../server/updates/SmartSelectionInstallReceiver.java | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/services/core/java/com/android/server/updates/ConfigUpdateInstallReceiver.java b/services/core/java/com/android/server/updates/ConfigUpdateInstallReceiver.java index cc25c8c5f836c..c3c841c73ca95 100644 --- a/services/core/java/com/android/server/updates/ConfigUpdateInstallReceiver.java +++ b/services/core/java/com/android/server/updates/ConfigUpdateInstallReceiver.java @@ -162,7 +162,7 @@ public class ConfigUpdateInstallReceiver extends BroadcastReceiver { } } - private boolean verifyVersion(int current, int alternative) { + protected boolean verifyVersion(int current, int alternative) { return (current < alternative); } diff --git a/services/core/java/com/android/server/updates/SmartSelectionInstallReceiver.java b/services/core/java/com/android/server/updates/SmartSelectionInstallReceiver.java index 53911c00cff6b..1457366a17a31 100644 --- a/services/core/java/com/android/server/updates/SmartSelectionInstallReceiver.java +++ b/services/core/java/com/android/server/updates/SmartSelectionInstallReceiver.java @@ -25,5 +25,9 @@ public class SmartSelectionInstallReceiver extends ConfigUpdateInstallReceiver { "metadata/smartselection", "version"); } -} + @Override + protected boolean verifyVersion(int current, int alternative) { + return true; + } +}