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

Add mPackageParserCallback assignment in TestParams constructor

Browse Source 
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
This commit is contained in:
Winson
2020-04-01 11:27:30 -07:00
committed by Winson Chiu
parent 8e865ecd06
commit 5cda454810
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/pm/PackageManagerService.java
View File

@@ -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;