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

Merge "Always update overlay paths of newly added apps" into sc-dev am: 17df75d895

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13596707

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie65816bc1ed789d8737dde4261b56838bb54f306
This commit is contained in:
TreeHugger Robot
2021-02-17 18:16:12 +00:00
committed by Automerger Merge Worker
parent 6412dbf964 17df75d895
commit 3ff5726533
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/om/OverlayManagerServiceImpl.java
View File

@@ -244,7 +244,11 @@ final class OverlayManagerServiceImpl {
@NonNull
Set<PackageAndUser> onPackageAdded(@NonNull final String pkgName,
final int userId) throws OperationFailedException {
return reconcileSettingsForPackage(pkgName, userId, 0 /* flags */);
final Set<PackageAndUser> updatedTargets = new ArraySet<>();
// Always update the overlays of newly added packages.
updatedTargets.add(new PackageAndUser(pkgName, userId));
updatedTargets.addAll(reconcileSettingsForPackage(pkgName, userId, 0 /* flags */));
return updatedTargets;
}
@NonNull
@@ -282,7 +286,7 @@ final class OverlayManagerServiceImpl {
private Set<PackageAndUser> removeOverlaysForUser(
@NonNull final Predicate<OverlayInfo> condition, final int userId) {
final List<OverlayInfo> overlays = mSettings.removeIf(
io -> userId == io.userId && condition.test(io) );
io -> userId == io.userId && condition.test(io));
Set<PackageAndUser> targets = Collections.emptySet();
for (int i = 0, n = overlays.size(); i < n; i++) {
final OverlayInfo info = overlays.get(i);