Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ced43fd5 authored by Inseob Kim's avatar Inseob Kim Committed by Automerger Merge Worker
Browse files

Merge "Revert^2 "Remove minor version from sepolicy version"" into main am:... 

Merge "Revert^2 "Remove minor version from sepolicy version"" into main am: 2a99c56d am: 3fbd20ed

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



Change-Id: Ia31c43dedf4e8952d02f612448bcb08c4ddf3d47
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0cec62b5 3fbd20ed

core/jni/android_os_VintfObject.cpp

+2 −1
Original line number Diff line number Diff line
@@ -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());

    }