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

Commit 3e0db91b authored by George Burgess IV's avatar George Burgess IV Committed by android-build-merger
Browse files

Merge "Make a logically const pointer const." am: 3d816e19 am: 7a23fdd7 

am: 12fea1b4

Change-Id: I75f19e2d3e7351dc264b890a9c6f0e703db2c8ae
parents d8ba3c4d 12fea1b4

media/libstagefright/foundation/AString.cpp

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ 
namespace android {



// static

const char *AString::kEmptyString = "";

constexpr const char *AString::kEmptyString;



AString::AString()

    : mData((char *)kEmptyString),

media/libstagefright/foundation/include/media/stagefright/foundation/AString.h

+1 −1
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ struct AString { 
    status_t writeToParcel(Parcel *parcel) const;



private:

    static const char *kEmptyString;

    constexpr static const char *kEmptyString = "";



    char *mData;

    size_t mSize;