Merge "Remove usage of mFileName in ObbInfo" (9568ba73) · Commits · e / os / android_frameworks_base

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);

+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);