commit ebcdb0881bc07cea657d1979d27620af190461bb
author Tony Mak <tonymak@google.com> Wed May 15 12:11:34 2019 -0700
committer android-build-merger <android-build-merger@google.com> Wed May 15 12:11:34 2019 -0700
tree 3c5dba1de008262991680488e1025ba5e99e15b0
parent 7b5f10f338ca5bdddb7d0393a6fb9f91d9515b26
parent dc40440e321e77bcd9db0336741e2f65d57cfc2c

Merge "Do not verify version in ConversationActions/LangIdInstallReceiver." into qt-dev
am: dc40440e32

Change-Id: I39796fc63d89c44f8fe44d47e76442e0fb6658e8

services/core/java/com/android/server/updates/ConversationActionsInstallReceiver.java

diff --git a/services/core/java/com/android/server/updates/ConversationActionsInstallReceiver.java b/services/core/java/com/android/server/updates/ConversationActionsInstallReceiver.java
index 7310af3..bbe534e 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 @@
                 "metadata/actions_suggestions",
                 "version");
     }
+
+    @Override
+    protected boolean verifyVersion(int current, int alternative) {
+        return true;
+    }
 }

services/core/java/com/android/server/updates/LangIdInstallReceiver.java

diff --git a/services/core/java/com/android/server/updates/LangIdInstallReceiver.java b/services/core/java/com/android/server/updates/LangIdInstallReceiver.java
index 05dad21..ecfa3aa 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 @@
             "metadata/lang_id",
             "version");
     }
+
+    @Override
+    protected boolean verifyVersion(int current, int alternative) {
+        return true;
+    }
 }