commit 9190062c8ca09f11fcfb2c678eb49f85366351ee
author Inseob Kim <inseob@google.com> Thu Feb 08 01:22:38 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Feb 08 01:22:38 2024 +0000
tree 7936a2fb11b680dc1d70e64a0ba08418613b4bbe
parent 8ded63e5fedddd0c4fa76bf1831c15eade456bec
parent 5a8e66fdace29f2be1d07b048be40f72c9e408f3

Merge "Remove minor version from sepolicy version" into main am: 5a8e66fdac

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2952245

Change-Id: Ic67e7b6ec67c04e17b7913ae72b00a587ac0d3b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

core/jni/android_os_VintfObject.cpp

diff --git a/core/jni/android_os_VintfObject.cpp b/core/jni/android_os_VintfObject.cpp
index ce4a337..8dc9d0a 100644
--- a/core/jni/android_os_VintfObject.cpp
+++ b/core/jni/android_os_VintfObject.cpp
@@ -39,6 +39,7 @@
 using vintf::HalManifest;
 using vintf::Level;
 using vintf::SchemaType;
+using vintf::SepolicyVersion;
 using vintf::to_string;
 using vintf::toXml;
 using vintf::Version;
@@ -139,7 +140,7 @@
         return nullptr;
     }
 
-    Version latest;
+    SepolicyVersion latest;
     for (const auto& range : versions) {
         latest = std::max(latest, range.maxVer());
     }