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

Remove stopship for idmap2 vendor sdk checking

Browse Source 
Idmap now checks if the version of the vendor partition is greater than
or equal to 29 or a development codename to enable enforcement of
overlayable resources.

Bug: 119390857
Test: manual
Change-Id: Ica25800432993beb7464436d4fba7cb391e621ef
This commit is contained in:
Ryan Mitchell
2019-06-03 10:48:48 -07:00
parent dc40440e32
commit 56db15b843
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cmds/idmap2/idmap2/Scan.cpp
View File

@@ -68,9 +68,10 @@ struct InputOverlay {
};
bool VendorIsQOrLater() {
// STOPSHIP(b/119390857): Check api version once Q sdk version is finalized
std::string version = android::base::GetProperty("ro.vndk.version", "Q");
return version == "Q" || version == "q";
constexpr int kQSdkVersion = 29;
int version = std::atoi(android::base::GetProperty("ro.vndk.version", "29").data());
// If the string cannot be parsed, it is a development sdk codename.
return version >= kQSdkVersion || version == 0;
}
Result<std::unique_ptr<std::vector<std::string>>> FindApkFiles(const std::vector<std::string>& dirs,