diff options
| -rw-r--r-- | services/core/java/com/android/server/om/IdmapManager.java | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/services/core/java/com/android/server/om/IdmapManager.java b/services/core/java/com/android/server/om/IdmapManager.java index 4b435de3538b..b604aa87f8f3 100644 --- a/services/core/java/com/android/server/om/IdmapManager.java +++ b/services/core/java/com/android/server/om/IdmapManager.java @@ -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) { |