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

Commit ed9de0d8 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "Merge "Remove stopship for IdmapManager vendor sdk" into qt-dev am:... 

Merge "Merge "Remove stopship for IdmapManager vendor sdk" into qt-dev am: 034670e9 am: 24046b67" into qt-r1-dev-plus-aosp
parents 437c4a6c 66358ae9

services/core/java/com/android/server/om/IdmapManager.java

+10 −3
Original line number Diff line number Diff line
@@ -58,9 +58,16 @@ class IdmapManager { 


    private static final boolean VENDOR_IS_Q_OR_LATER;

    static {

        // STOPSHIP(b/119390857): Check api version once Q sdk version is finalized

        final String value = SystemProperties.get("ro.vndk.version", "Q");

        VENDOR_IS_Q_OR_LATER = value.equals("Q") || value.equals("q");

        final String value = SystemProperties.get("ro.vndk.version", "29");

        boolean isQOrLater;

        try {

            isQOrLater = Integer.parseInt(value) >= 29;

        } catch (NumberFormatException e) {

            // The version is not a number, therefore it is a development codename.

            isQOrLater = true;

        }



        VENDOR_IS_Q_OR_LATER = isQOrLater;

    }



    IdmapManager(final Installer installer, final PackageManagerHelper packageManager) {