| commit | b4a1e2a56ac1dc7397f1478d554e07a618c46135 | [log] [tgz] |
|---|---|---|
| author | Ikjoon Jang <ikjn@google.com> | Thu Feb 08 05:31:12 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Feb 08 05:31:12 2024 +0000 |
| tree | f893e1be40220b0768296e95a1a64678aed48347 | |
| parent | 9a467f3e517cdd2013ff02a83b8f610ec0e44f3d [diff] | |
| parent | 338e56c483a88467c34deef37dfa09a1a458d98e [diff] |
Merge "Revert "Remove minor version from sepolicy version"" into main am: c104ba5541 am: 338e56c483 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2954990 Change-Id: Ifeb47f82963c488c7545cb52e3ffb4e0063c7e9f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/core/jni/android_os_VintfObject.cpp b/core/jni/android_os_VintfObject.cpp index 8dc9d0a..ce4a337 100644 --- a/core/jni/android_os_VintfObject.cpp +++ b/core/jni/android_os_VintfObject.cpp
@@ -39,7 +39,6 @@ using vintf::HalManifest; using vintf::Level; using vintf::SchemaType; -using vintf::SepolicyVersion; using vintf::to_string; using vintf::toXml; using vintf::Version; @@ -140,7 +139,7 @@ return nullptr; } - SepolicyVersion latest; + Version latest; for (const auto& range : versions) { latest = std::max(latest, range.maxVer()); }