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

Load static RROs in OverlayManagerService

Browse Source 
Only RROs targeting "android" are loaded from AssetManager, and so
others should be loaded from OverlayManagerService.

The RROs targeting "android" would be ingored as they are to avoid
redundant loading.

Bug: 76205654
Test: succeeded building and tested with taimen
Change-Id: Ibeeb3c3f3338a845b2f4c485305636003d9dbd44
This commit is contained in:
Jaekyun Seok
2018-04-04 11:28:21 +09:00
parent dc4309544d
commit 5dbcb8a6bb
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/OverlayManagerSettings.java
View File

@@ -179,15 +179,19 @@ final class OverlayManagerSettings {
List<OverlayInfo> getOverlaysForTarget(@NonNull final String targetPackageName,
final int userId) {
// Static RROs targeting "android" are loaded from AssetManager, and so they should be
// ignored in OverlayManagerService.
return selectWhereTarget(targetPackageName, userId)
.filter((i) -> !i.isStatic())
.filter((i) -> !(i.isStatic() && "android".equals(i.getTargetPackageName())))
.map(SettingsItem::getOverlayInfo)
.collect(Collectors.toList());
}
ArrayMap<String, List<OverlayInfo>> getOverlaysForUser(final int userId) {
// Static RROs targeting "android" are loaded from AssetManager, and so they should be
// ignored in OverlayManagerService.
return selectWhereUser(userId)
.filter((i) -> !i.isStatic())
.filter((i) -> !(i.isStatic() && "android".equals(i.getTargetPackageName())))
.map(SettingsItem::getOverlayInfo)
.collect(Collectors.groupingBy(info -> info.targetPackageName, ArrayMap::new,
Collectors.toList()));