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

Merge "Fix atoi build errors" into qt-dev

Browse Source 
am: 9fe4ba7a43

Change-Id: I9617284d09ec85c699d12045a8761b97b226b795
This commit is contained in:
Ryan Mitchell
2019-06-04 08:14:36 -07:00
committed by android-build-merger
parent 2447bb6e8e 9fe4ba7a43
commit ab3e54dc8a
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -69,7 +69,10 @@ struct InputOverlay {
bool VendorIsQOrLater() { bool VendorIsQOrLater() {
constexpr int kQSdkVersion = 29; constexpr int kQSdkVersion = 29;
int version = std::atoi(android::base::GetProperty("ro.vndk.version", "29").data()); constexpr int kBase = 10;
std::string version_prop = android::base::GetProperty("ro.vndk.version", "29");
int version = strtol(version_prop.data(), nullptr, kBase);
// If the string cannot be parsed, it is a development sdk codename. // If the string cannot be parsed, it is a development sdk codename.
return version >= kQSdkVersion || version == 0; return version >= kQSdkVersion || version == 0;
} }