Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove usage of mFileName in ObbInfo"

Browse Source
This commit is contained in:
Treehugger Robot
2023-05-08 22:44:34 +00:00
committed by Gerrit Code Review
parent 635e76753b 5a4db98164
commit 9568ba7399
2 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libs/androidfw/include/androidfw/ObbFile.h
View File

@@ -43,10 +43,6 @@ public:
bool removeFrom(const char* filename); bool removeFrom(const char* filename);
bool removeFrom(int fd); bool removeFrom(int fd);
const char* getFileName() const {
return mFileName;
}
const String8 getPackageName() const { const String8 getPackageName() const {
return mPackageName; return mPackageName;
} }
@@ -127,8 +123,6 @@ private:
/* The encryption salt. */ /* The encryption salt. */
unsigned char mSalt[8]; unsigned char mSalt[8];
const char* mFileName;
size_t mFooterStart; size_t mFooterStart;
bool parseObbFile(int fd); bool parseObbFile(int fd);

2
native/android/storage_manager.cpp
View File

@@ -86,7 +86,7 @@ protected:
return nullptr; return nullptr;
} }
String16 fileName(obbFile->getFileName()); String16 fileName(canonicalPath);
String16 packageName(obbFile->getPackageName()); String16 packageName(obbFile->getPackageName());
size_t length; size_t length;
const unsigned char* salt = obbFile->getSalt(&length); const unsigned char* salt = obbFile->getSalt(&length);