diff options
author | Joonas Kylmälä <joonas.kylmala@iki.fi> | 2018-08-27 13:38:07 -0400 |
---|---|---|
committer | Joonas Kylmälä <joonas.kylmala@iki.fi> | 2018-09-26 16:34:17 -0400 |
commit | d564bdb996b8d20116d8dca42d1c76f6462f8892 (patch) | |
tree | a149870c19b1e2e98985d01e8d8369d35c2438fd | |
parent | 035958f21ed8f20d8bf8956d4d1b958442a02f6d (diff) | |
download | frameworks_base-d564bdb996b8d20116d8dca42d1c76f6462f8892.tar.gz frameworks_base-d564bdb996b8d20116d8dca42d1c76f6462f8892.tar.bz2 frameworks_base-d564bdb996b8d20116d8dca42d1c76f6462f8892.zip |
Revert "Point ResXMLTree to a copy of the asset buffer in AssetManager::getPkgName()"
This reverts commit 953d2a3493aaceb3209afc7eef1ff1e7f7242908.
The 953d2a3493aaceb3209afc7eef1ff1e7f7242908 commit (Point ResXMLTree
to a copy of the asset buffer in AssetManager::getPkgName()) was a fix
for preventing devices from ending in a boot loop when an application
that was created with aapt2 was installed.
Since upstream has now fixed it with commit "AssetManager: fix
use-after-free of asset" we can now drop this patch to use
upstream's fix instead.
Signed-off-by: Joonas Kylmälä <joonas.kylmala@iki.fi>
-rw-r--r-- | libs/androidfw/AssetManager.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/androidfw/AssetManager.cpp b/libs/androidfw/AssetManager.cpp index f99154ea6fd..e6e45633dc4 100644 --- a/libs/androidfw/AssetManager.cpp +++ b/libs/androidfw/AssetManager.cpp @@ -421,7 +421,7 @@ String8 AssetManager::getPkgName(const char *apkPath) { Asset* manifestAsset = openNonAssetInPathLocked(kAndroidManifest, Asset::ACCESS_BUFFER, ap); tree.setTo(manifestAsset->getBuffer(true), - manifestAsset->getLength(), true); + manifestAsset->getLength()); tree.restart(); size_t len; |