summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Tony Mak <tonymak@google.com> 2019-05-15 22:36:20 -0700
committer android-build-merger <android-build-merger@google.com> 2019-05-15 22:36:20 -0700
commitda59c9d45bc8caef515e67786697c815a080e38b (patch)
tree50d6d8147ebf48493d8435502f349df7ca99b219
parentbe569d630195c776c49c6255f44723e2dfdbf13a (diff)
parentdc40440e321e77bcd9db0336741e2f65d57cfc2c (diff)
Merge "Do not verify version in ConversationActions/LangIdInstallReceiver." into qt-dev
am: dc40440e32 Change-Id: I7d7f72c0ca6a14f9fd7f87699994299e90ccd242
-rw-r--r--services/core/java/com/android/server/updates/ConversationActionsInstallReceiver.java5
-rw-r--r--services/core/java/com/android/server/updates/LangIdInstallReceiver.java5
2 files changed, 10 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/updates/ConversationActionsInstallReceiver.java b/services/core/java/com/android/server/updates/ConversationActionsInstallReceiver.java
index 7310af3a6eb6..bbe534e5aeda 100644
--- a/services/core/java/com/android/server/updates/ConversationActionsInstallReceiver.java
+++ b/services/core/java/com/android/server/updates/ConversationActionsInstallReceiver.java
@@ -25,4 +25,9 @@ public class ConversationActionsInstallReceiver extends ConfigUpdateInstallRecei
"metadata/actions_suggestions",
"version");
}
+
+ @Override
+ protected boolean verifyVersion(int current, int alternative) {
+ return true;
+ }
}
diff --git a/services/core/java/com/android/server/updates/LangIdInstallReceiver.java b/services/core/java/com/android/server/updates/LangIdInstallReceiver.java
index 05dad2178798..ecfa3aa97ac0 100644
--- a/services/core/java/com/android/server/updates/LangIdInstallReceiver.java
+++ b/services/core/java/com/android/server/updates/LangIdInstallReceiver.java
@@ -25,4 +25,9 @@ public class LangIdInstallReceiver extends ConfigUpdateInstallReceiver {
"metadata/lang_id",
"version");
}
+
+ @Override
+ protected boolean verifyVersion(int current, int alternative) {
+ return true;
+ }
}