Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c3b0712e authored by Elliott Hughes's avatar Elliott Hughes Committed by android-build-merger
Browse files

Merge "Use String8 for UTF16 to UTF8 conversion."

am: 527c9132

Change-Id: Ica55f07373dfada4729df8472b1bae71bf0011c3
parents f9e3e406 527c9132
Loading
Loading
Loading
Loading
+2 −9
Original line number Diff line number Diff line
@@ -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,