summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authord34d <clark@cyngn.com>2015-06-29 15:04:37 -0700
committerClark Scheff <clark@cyngn.com>2015-10-27 18:21:41 -0700
commita7a7c5ac24e5bb78e247c7f61105c4c9e892dc59 (patch)
tree961c8840b662aab269ebd1773586d587a3472c49 /services
parentd008d55f8ab1b1cf6e09aa49170f4b05f66ce764 (diff)
downloadframeworks_base-a7a7c5ac24e5bb78e247c7f61105c4c9e892dc59.zip
frameworks_base-a7a7c5ac24e5bb78e247c7f61105c4c9e892dc59.tar.gz
frameworks_base-a7a7c5ac24e5bb78e247c7f61105c4c9e892dc59.tar.bz2
Stop checking for resources.arsc in shouldCreateIdmap
The check for resources.arsc in the target apk was a fix for when we supported legacy themes (t-mobile engine). Since support for legacy themes was dropped in cm-12.0, this patch just adds extra overhead and results in ANRs in some cases. Change-Id: I275d9ccd3e67eead91f3e8c39a2b64f31f473ed3
Diffstat (limited to 'services')
-rw-r--r--services/core/java/com/android/server/pm/PackageManagerService.java16
1 files changed, 0 insertions, 16 deletions
diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index 1247c07..0a9c143 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -8284,32 +8284,16 @@ public class PackageManagerService extends IPackageManager.Stub {
}
/**
- * Checks for existance of resources.arsc in target apk, then
* Compares the 32 bit hash of the target and overlay to those stored
* in the idmap and returns true if either hash differs
* @param targetPkg
* @param overlayPkg
* @return
- * @throws IOException
*/
private boolean shouldCreateIdmap(PackageParser.Package targetPkg,
PackageParser.Package overlayPkg) {
if (targetPkg == null || targetPkg.baseCodePath == null || overlayPkg == null) return false;
- // Check if the target app has resources.arsc.
- // If it does not, then there is nothing to idmap
- ZipFile zfile = null;
- try {
- zfile = new ZipFile(targetPkg.baseCodePath);
- if (zfile.getEntry("resources.arsc") == null) return false;
- } catch (IOException e) {
- Log.e(TAG, "Error while checking resources.arsc on" + targetPkg.baseCodePath, e);
- return false;
- } finally {
- IoUtils.closeQuietly(zfile);
- }
-
-
int targetHash = getPackageHashCode(targetPkg);
int overlayHash = getPackageHashCode(overlayPkg);