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

Commit 0c46d7b5 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Set application info flags prior to scanning" into pi-dev

parents f0aeb057 94c2b750

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

+5 −0
Original line number Diff line number Diff line
@@ -8692,6 +8692,7 @@ public class PackageManagerService extends IPackageManager.Stub 
                            disabledPkgSetting /* pkgSetting */, null /* disabledPkgSetting */,

                            null /* originalPkgSetting */, null, parseFlags, scanFlags,

                            (pkg == mPlatformPackage), user);

                    applyPolicy(pkg, parseFlags, scanFlags);

                    scanPackageOnlyLI(request, mFactoryTest, -1L);

                }

            }
@@ -9981,6 +9982,10 @@ public class PackageManagerService extends IPackageManager.Stub 
        return scanFlags;

    }













    // TODO: scanPackageNewLI() and scanPackageOnly() should be merged. But, first, commiting













    // the results / removing app data needs to be moved up a level to the callers of this













    // method. Also, we need to solve the problem of potentially creating a new shared user













    // setting. That can probably be done later and patch things up after the fact.















    @GuardedBy("mInstallLock")















    private PackageParser.Package scanPackageNewLI(@NonNull PackageParser.Package pkg,















            final @ParseFlags int parseFlags, @ScanFlags int scanFlags, long currentTime,