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

Commit e5018ad2 authored by yingying's avatar yingying Committed by Gerrit - the friendly Code Review server
Browse files

base: Use type8 and name8 to create the string when create idmap. 

When the ResourceType use the UTF-8 to get resource name, the name and type
will be null, so need use the type8 and name8 to create the string.

Change-Id: I0c0069ab9ac46b953be1bd58fd04dbdfb6e9ad88
parent cb0469c3

libs/androidfw/ResourceTypes.cpp

+12 −2
Original line number Diff line number Diff line
@@ -5375,8 +5375,18 @@ status_t ResTable::createIdmap(const ResTable& overlay, uint32_t originalCrc, ui 
                continue;

            }



            const String16 overlayType(resName.type, resName.typeLen);

            const String16 overlayName(resName.name, resName.nameLen);

            String16 overlayType, overlayName;

            if (resName.type8 != NULL) {

                overlayType = String16(resName.type8, resName.typeLen);

            } else {

                overlayType = String16(resName.type, resName.typeLen);

            }

            if (resName.name8 != NULL) {

                overlayName = String16(resName.name8, resName.nameLen);

            } else {

                overlayName = String16(resName.name, resName.nameLen);

            }



            uint32_t overlayResID = overlay.identifierForName(overlayName.string(),

                                                              overlayName.size(),

                                                              overlayType.string(),