Merge "Set application info flags prior to scanning" into pi-dev
diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index f4360e4..052f239 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -8692,6 +8692,7 @@
disabledPkgSetting /* pkgSetting */, null /* disabledPkgSetting */,
null /* originalPkgSetting */, null, parseFlags, scanFlags,
(pkg == mPlatformPackage), user);
+ applyPolicy(pkg, parseFlags, scanFlags);
scanPackageOnlyLI(request, mFactoryTest, -1L);
}
}
@@ -9981,6 +9982,10 @@
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,