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

Commit d74fc2ad authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Remove usage of mFileName in ObbInfo" am: 9568ba73 am: b7c51022 am:... 

Merge "Remove usage of mFileName in ObbInfo" am: 9568ba73 am: b7c51022 am: 5c34b1be am: 781f0dd4

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2493876



Change-Id: Ib7585bd567a609c101e45931065852f6e8886e1f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8bae2042 781f0dd4

libs/androidfw/include/androidfw/ObbFile.h

+0 −6
Original line number Diff line number Diff line
@@ -43,10 +43,6 @@ public: 
    bool removeFrom(const char* filename);

    bool removeFrom(int fd);



    const char* getFileName() const {

        return mFileName;

    }



    const String8 getPackageName() const {

        return mPackageName;

    }
@@ -127,8 +123,6 @@ private: 
    /* The encryption salt. */

    unsigned char mSalt[8];



    const char* mFileName;



    size_t mFooterStart;



    bool parseObbFile(int fd);

native/android/storage_manager.cpp

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ protected: 
            return nullptr;

        }



        String16 fileName(obbFile->getFileName());

        String16 fileName(canonicalPath);

        String16 packageName(obbFile->getPackageName());

        size_t length;

        const unsigned char* salt = obbFile->getSalt(&length);