Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2ef59263 authored by David Brazdil's avatar David Brazdil Committed by android-build-merger
Browse files

Merge "Enable profile merging for post-OTA package verification" into nyc-dev am: 5bc7f5f0 

am: 8aef4c8f

* commit '8aef4c8f':
  Enable profile merging for post-OTA package verification

Change-Id: I4c5c1e7bd9bb60526ff5893c4b2a4c76e4c2c4f8
parents 691d7b24 8aef4c8f

services/core/java/com/android/server/pm/BackgroundDexOptService.java

+1 −1
Original line number Diff line number Diff line
@@ -148,7 +148,7 @@ public class BackgroundDexOptService extends JobService { 
                    // jobs because PackageDexOptimizer.performDexOpt is synchronized.

                    pm.performDexOpt(pkg,

                            /* instruction set */ null,

                            /* checkProfiles */ false,

                            /* checkProfiles */ true,

                            PackageManagerService.REASON_BOOT,

                            /* force */ false);

                }

services/core/java/com/android/server/pm/PackageManagerService.java

+1 −1
Original line number Diff line number Diff line
@@ -7203,7 +7203,7 @@ public class PackageManagerService extends IPackageManager.Stub { 














            performDexOpt(pkg.packageName,















                    null /* instructionSet */,













                    false /* checkProfiles */,













                    true /* checkProfiles */,















                    causeFirstBoot ? REASON_FIRST_BOOT : REASON_BOOT,















                    false /* force */);















        }