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

Release mPackages lock earlier

Browse Source 
am: 94f9be2ee2

Change-Id: I461f9588d34413705ee54d410b0d55936b699a04
This commit is contained in:
Todd Kennedy
2016-09-06 21:15:40 +00:00
committed by android-build-merger
parent 6c22810fb3 94f9be2ee2
commit 2ee7053cfc
1 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
services/core/java/com/android/server/pm/OtaDexoptService.java
View File

@@ -93,38 +93,39 @@ public class OtaDexoptService extends IOtaDexopt.Stub {
if (mDexoptCommands != null) { if (mDexoptCommands != null) {
throw new IllegalStateException("already called prepare()"); throw new IllegalStateException("already called prepare()");
} }
final List<PackageParser.Package> important;
final List<PackageParser.Package> others;
synchronized (mPackageManagerService.mPackages) { synchronized (mPackageManagerService.mPackages) {
// Important: the packages we need to run with ab-ota compiler-reason. // Important: the packages we need to run with ab-ota compiler-reason.
List<PackageParser.Package> important = PackageManagerServiceUtils.getPackagesForDexopt( important = PackageManagerServiceUtils.getPackagesForDexopt(
mPackageManagerService.mPackages.values(), mPackageManagerService); mPackageManagerService.mPackages.values(), mPackageManagerService);
// Others: we should optimize this with the (first-)boot compiler-reason. // Others: we should optimize this with the (first-)boot compiler-reason.
List<PackageParser.Package> others = others = new ArrayList<>(mPackageManagerService.mPackages.values());
new ArrayList<>(mPackageManagerService.mPackages.values());
others.removeAll(important); others.removeAll(important);
// Pre-size the array list by over-allocating by a factor of 1.5. // Pre-size the array list by over-allocating by a factor of 1.5.
mDexoptCommands = new ArrayList<>(3 * mPackageManagerService.mPackages.size() / 2); mDexoptCommands = new ArrayList<>(3 * mPackageManagerService.mPackages.size() / 2);
}
for (PackageParser.Package p : important) { for (PackageParser.Package p : important) {
// Make sure that core apps are optimized according to their own "reason". // Make sure that core apps are optimized according to their own "reason".
// If the core apps are not preopted in the B OTA, and REASON_AB_OTA is not speed // If the core apps are not preopted in the B OTA, and REASON_AB_OTA is not speed
// (by default is speed-profile) they will be interepreted/JITed. This in itself is // (by default is speed-profile) they will be interepreted/JITed. This in itself is
// not a problem as we will end up doing profile guided compilation. However, some // not a problem as we will end up doing profile guided compilation. However, some
// core apps may be loaded by system server which doesn't JIT and we need to make // core apps may be loaded by system server which doesn't JIT and we need to make
// sure we don't interpret-only // sure we don't interpret-only
int compilationReason = p.coreApp int compilationReason = p.coreApp
? PackageManagerService.REASON_CORE_APP ? PackageManagerService.REASON_CORE_APP
: PackageManagerService.REASON_AB_OTA; : PackageManagerService.REASON_AB_OTA;
mDexoptCommands.addAll(generatePackageDexopts(p, compilationReason)); mDexoptCommands.addAll(generatePackageDexopts(p, compilationReason));
} }
for (PackageParser.Package p : others) { for (PackageParser.Package p : others) {
// We assume here that there are no core apps left. // We assume here that there are no core apps left.
if (p.coreApp) { if (p.coreApp) {
throw new IllegalStateException("Found a core app that's not important"); throw new IllegalStateException("Found a core app that's not important");
}
mDexoptCommands.addAll(
generatePackageDexopts(p, PackageManagerService.REASON_FIRST_BOOT));
} }
mDexoptCommands.addAll(
generatePackageDexopts(p, PackageManagerService.REASON_FIRST_BOOT));
} }
completeSize = mDexoptCommands.size(); completeSize = mDexoptCommands.size();
} }