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

Merge "Move dump preferred activities to the ComputerEngine" into sc-dev

Browse Source
This commit is contained in:
Rhed Jao
2021-03-10 03:14:49 +00:00
committed by Android (Google) Code Review
parent 3f52c2a117 4cf3ba518b
commit 117470de61
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4482,6 +4482,10 @@ public class PackageManagerService extends IPackageManager.Stub
break;
}
case DumpState.DUMP_PREFERRED:
mSettings.dumpPreferred(pw, dumpState, packageName);
break;
case DumpState.DUMP_PREFERRED_XML:
{
pw.flush();
@@ -24141,11 +24145,7 @@ public class PackageManagerService extends IPackageManager.Stub
}
if (!checkin && dumpState.isDumping(DumpState.DUMP_PREFERRED)) {
// TODO: This cannot be moved to ComputerEngine since some variables with collections
// types in IntentResolver such as mTypeToFilter do not have a copy of `F[]`.
synchronized (mLock) {
mSettings.dumpPreferred(pw, dumpState, packageName);
}
dump(DumpState.DUMP_PREFERRED, fd, pw, dumpState);
}
if (!checkin && dumpState.isDumping(DumpState.DUMP_PREFERRED_XML)) {