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

Merge "Use String8 for UTF16 to UTF8 conversion."

Browse Source
This commit is contained in:
Elliott Hughes
2019-08-08 19:12:04 +00:00
committed by Gerrit Code Review
parent 6452cc3cc1 1f7b854d70
commit 527c91320d
1 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
cmds/idmap/scan.cpp
View File

@@ -9,7 +9,6 @@
#include <androidfw/ResourceTypes.h>
#include <androidfw/StreamingZipInflater.h>
#include <androidfw/ZipFileRO.h>
#include <cutils/jstring.h>
#include <cutils/properties.h>
#include <private/android_filesystem_config.h> // for AID_SYSTEM
#include <utils/SortedVector.h>
@@ -84,15 +83,9 @@ namespace {
}
bool check_property(String16 property, String16 value) {
const char *prop;
const char *val;
prop = strndup16to8(property.string(), property.size());
char propBuf[PROPERTY_VALUE_MAX];
property_get(prop, propBuf, NULL);
val = strndup16to8(value.string(), value.size());
return (strcmp(propBuf, val) == 0);
property_get(String8(property).c_str(), propBuf, NULL);
return String8(value) == propBuf;
}
int parse_overlay_tag(const ResXMLTree& parser, const char *target_package_name,