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

Commit 9d01dab8 authored by Todd Kennedy's avatar Todd Kennedy Committed by android-build-merger
Browse files

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

am: 0c46d7b5

Change-Id: Ib549564d4c415b4883b78c9f3ec581ae445f7975
parents 4628a8cd 0c46d7b5

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

                }

            }
@@ -9992,6 +9993,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,