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

Commit 975e03a9 authored by Kenny Root's avatar Kenny Root Committed by Android Git Automerger
Browse files

am 1e1d4492: am 218aa945: Merge change I6478884a into eclair-mr2 

Merge commit '1e1d44924a334637f9fb47ca8796625bd86cb66a'

* commit '1e1d44924a334637f9fb47ca8796625bd86cb66a':
  Add string resource type inspection
parents 4ec6af25 50f981dc

include/utils/ResourceTypes.h

+4 −0
Original line number Diff line number Diff line
@@ -454,6 +454,10 @@ public: 


    size_t size() const;



#ifndef HAVE_ANDROID_OS

    bool isUTF8() const;

#endif



private:

    status_t                    mError;

    void*                       mOwnedData;

libs/utils/ResourceTypes.cpp

+9 −1
Original line number Diff line number Diff line
@@ -576,6 +576,13 @@ size_t ResStringPool::size() const 
    return (mError == NO_ERROR) ? mHeader->stringCount : 0;

}



#ifndef HAVE_ANDROID_OS

bool ResStringPool::isUTF8() const

{

    return (mHeader->flags&ResStringPool_header::UTF8_FLAG)!=0;

}

#endif



// --------------------------------------------------------------------

// --------------------------------------------------------------------

// --------------------------------------------------------------------
@@ -4016,7 +4023,8 @@ void ResTable::print_value(const Package* pkg, const Res_value& value) const 
        if (str == NULL) {

            printf("(string) null\n");

        } else {

            printf("(string) \"%s\"\n",

            printf("(string%d) \"%s\"\n",

                    pkg->header->values.isUTF8()?8:16,

                    String8(str, len).string());

        } 

    } else if (value.dataType == Res_value::TYPE_FLOAT) {