Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Merge "Remove stopship for IdmapManager vendor sdk" into qt-dev am: 034670e90b am: 24046b674c" into qt-r1-dev-plus-aosp

Browse Source 
am: ed9de0d88e

Change-Id: Ice73ab06fb637b8e29f08489d38a04b35980ddcd
This commit is contained in:
Ryan Mitchell
2019-06-12 14:41:36 -07:00
committed by android-build-merger
parent 7b407d828f ed9de0d88e
commit f9f31f8cd5
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
services/core/java/com/android/server/om/IdmapManager.java
View File

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