summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Inseob Kim <inseob@google.com> 2024-02-08 01:22:38 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-02-08 01:22:38 +0000
commit9190062c8ca09f11fcfb2c678eb49f85366351ee (patch)
tree7936a2fb11b680dc1d70e64a0ba08418613b4bbe
parent8ded63e5fedddd0c4fa76bf1831c15eade456bec (diff)
parent5a8e66fdace29f2be1d07b048be40f72c9e408f3 (diff)
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>
-rw-r--r--core/jni/android_os_VintfObject.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/jni/android_os_VintfObject.cpp b/core/jni/android_os_VintfObject.cpp
index ce4a33735c6d..8dc9d0aa578e 100644
--- a/core/jni/android_os_VintfObject.cpp
+++ b/core/jni/android_os_VintfObject.cpp
@@ -39,6 +39,7 @@ using vintf::CompatibilityMatrix;
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 @@ static jstring android_os_VintfObject_getPlatformSepolicyVersion(JNIEnv* env, jc
return nullptr;
}
- Version latest;
+ SepolicyVersion latest;
for (const auto& range : versions) {
latest = std::max(latest, range.maxVer());
}