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

Revert "libandroidfw hardening for IncFs"

Browse Source 
Revert "Move map_ptr to incfs namspace"

Revert submission 12787270

Reason for revert: b/173250495
Reverted Changes:
I5cd1bc8a2:libandroidfw hardening for IncFs
Ice5dbcfb2:Move map_ptr to incfs namspace
I29ccdc8ed:Do not cache bag parent stack until requested
I1e9e9acaa:Cache resolved theme values

Change-Id: Ib90ef68339710086df41e9abe0833a542d03a74f
This commit is contained in:
Ryan Mitchell
2020-11-13 23:55:20 +00:00
parent 6ca48473e5
commit 55ef6167a2
63 changed files with 2385 additions and 2635 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
tools/split-select/Main.cpp
View File

@@ -182,18 +182,14 @@ static bool getAppInfo(const String8& path, AppInfo& outInfo) {
if (type >= Res_value::TYPE_FIRST_INT && type <= Res_value::TYPE_LAST_INT) {
outInfo.minSdkVersion = xml.getAttributeData(idx);
} else if (type == Res_value::TYPE_STRING) {
auto minSdk8 = xml.getStrings().string8ObjectAt(idx);
if (!minSdk8.has_value()) {
fprintf(stderr, "warning: failed to retrieve android:minSdkVersion.\n");
String8 minSdk8(xml.getStrings().string8ObjectAt(idx));
char* endPtr;
int minSdk = strtol(minSdk8.string(), &endPtr, 10);
if (endPtr != minSdk8.string() + minSdk8.size()) {
fprintf(stderr, "warning: failed to parse android:minSdkVersion '%s'\n",
minSdk8.string());
} else {
char *endPtr;
int minSdk = strtol(minSdk8->string(), &endPtr, 10);
if (endPtr != minSdk8->string() + minSdk8->size()) {
fprintf(stderr, "warning: failed to parse android:minSdkVersion '%s'\n",
minSdk8->string());
} else {
outInfo.minSdkVersion = minSdk;
}
outInfo.minSdkVersion = minSdk;
}
} else {
fprintf(stderr, "warning: unrecognized value for android:minSdkVersion.\n");