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

Commit 66358ae9 authored by Ryan Mitchell's avatar Ryan Mitchell Committed by android-build-merger
Browse files

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

am: 24046b67

Change-Id: I47d6fe28d4c45cfd1f4646344c995d0ab1a22db8
parents 62d2fca7 24046b67

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) {