From 5cda4548108894d175ec6eaa578d193501bd6ae3 Mon Sep 17 00:00:00 2001 From: Winson Date: Wed, 1 Apr 2020 11:27:30 -0700 Subject: [PATCH] Add mPackageParserCallback assignment in TestParams constructor This is a fix for a revert of a revert at change ID I4f5247f528f62c175bd34f0e4cb16c9456c8afe4. It conflicts with Id53a2e65f6e5e4dee9a41cc77007275b3a220ac3, which was merged before. That change moved the final callback field to constructor assignment, so this fix does the same for the test constructor. Bug: 113638339 Test: build and atest PackageManagerComponentOverrideTests Change-Id: Ia2c456335ad490ff3d555ed735edf3ae702ef836 --- .../core/java/com/android/server/pm/PackageManagerService.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index 8f63131e13276..f96ab1d9a0427 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -1065,6 +1065,7 @@ public class PackageManagerService extends IPackageManager.Stub public boolean onlyCore; public OverlayConfig overlayConfig; public PackageDexOptimizer packageDexOptimizer; + public PackageParser2.Callback packageParserCallback; public IPermissionManager permissionManagerService; public PendingPackageBroadcasts pendingPackageBroadcasts; public PackageManagerInternal pmInternal; @@ -2779,6 +2780,7 @@ public class PackageManagerService extends IPackageManager.Stub mOnlyCore = testParams.onlyCore; mOverlayConfig = testParams.overlayConfig; mPackageDexOptimizer = testParams.packageDexOptimizer; + mPackageParserCallback = testParams.packageParserCallback; mPendingBroadcasts = testParams.pendingPackageBroadcasts; mPermissionManagerService = testParams.permissionManagerService; mPmInternal = testParams.pmInternal;