From 9b7803160a6b26fd607eff9e9b613cf96e1bbcc9 Mon Sep 17 00:00:00 2001 From: Ryan Mitchell Date: Mon, 10 Jun 2019 12:30:36 -0700 Subject: [PATCH] Remove stopship for IdmapManager vendor sdk Idmap now checks if the version of the vendor partition is greater than or equal to 29 or a development code name to enable enforcement of overlayable resources. Bug: 119390857 Test: manual Change-Id: Iff224b9fae4b74848bd59fedd58236f93a5d7a9a --- .../java/com/android/server/om/IdmapManager.java | 13 ++++++++++--- 1 file 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 4b435de3538b0..b604aa87f8f30 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) {