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

Merge changes from topic 'remove-idmap-adamlesinski'

Browse Source 
* changes:
  Fix memory leak during idmap creation
  installd: add command 'removeIdmap'
This commit is contained in:
TreeHugger Robot
2017-01-25 06:33:29 +00:00
committed by Android (Google) Code Review
parent 3ca3107a82 6bb13da278
commit b2540e8d8d
2 changed files with 33 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
libs/androidfw/AssetManager.cpp
View File

@@ -288,22 +288,34 @@ bool AssetManager::createIdmap(const char* targetApkPath, const char* overlayApk
{
AutoMutex _l(mLock);
const String8 paths[2] = { String8(targetApkPath), String8(overlayApkPath) };
ResTable tables[2];
Asset* assets[2] = {NULL, NULL};
bool ret = false;
{
ResTable tables[2];
for (int i = 0; i < 2; ++i) {
asset_path ap;
ap.type = kFileTypeRegular;
ap.path = paths[i];
Asset* ass = openNonAssetInPathLocked("resources.arsc", Asset::ACCESS_BUFFER, ap);
if (ass == NULL) {
ALOGW("failed to find resources.arsc in %s\n", ap.path.string());
return false;
for (int i = 0; i < 2; ++i) {
asset_path ap;
ap.type = kFileTypeRegular;
ap.path = paths[i];
assets[i] = openNonAssetInPathLocked("resources.arsc",
Asset::ACCESS_BUFFER, ap);
if (assets[i] == NULL) {
ALOGW("failed to find resources.arsc in %s\n", ap.path.string());
goto exit;
}
if (tables[i].add(assets[i]) != NO_ERROR) {
ALOGW("failed to add %s to resource table", paths[i].string());
goto exit;
}
}
tables[i].add(ass);
ret = tables[0].createIdmap(tables[1], targetCrc, overlayCrc,
targetApkPath, overlayApkPath, (void**)outData, outSize) == NO_ERROR;
}
return tables[0].createIdmap(tables[1], targetCrc, overlayCrc,
targetApkPath, overlayApkPath, (void**)outData, outSize) == NO_ERROR;
exit:
delete assets[0];
delete assets[1];
return ret;
}
bool AssetManager::addDefaultAssets()

9
services/core/java/com/android/server/pm/Installer.java
View File

@@ -295,6 +295,15 @@ public class Installer extends SystemService {
}
}
public void removeIdmap(String overlayApkPath) throws InstallerException {
if (!checkBeforeRemote()) return;
try {
mInstalld.removeIdmap(overlayApkPath);
} catch (Exception e) {
throw InstallerException.from(e);
}
}
public void rmdex(String codePath, String instructionSet) throws InstallerException {
assertValidInstructionSet(instructionSet);
if (!checkBeforeRemote()) return;