diff options
| author | 2024-02-08 01:38:23 +0000 | |
|---|---|---|
| committer | 2024-02-08 01:38:23 +0000 | |
| commit | 4cc60b0c24cee6c07760659405154fb8fc81b74e (patch) | |
| tree | bf8c7391c7575a804f9cdd8af37d709ef8ea0846 | |
| parent | f4036d6518bd58c8ce5a506d3e234a7c79d371bb (diff) | |
| parent | 9190062c8ca09f11fcfb2c678eb49f85366351ee (diff) | |
Merge "Remove minor version from sepolicy version" into main am: 5a8e66fdac am: 9190062c8c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2952245
Change-Id: I5821ac3421a3184f07d0b376f2750141bd621195
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | core/jni/android_os_VintfObject.cpp | 3 |
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()); } |