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

OMS: never filter out isStatic="true" overlays

Browse Source 
Now that the OMS knows about overlays with the isStatic="true"
attribute, stop filtering out those overlays that have both
isStatic="true" and targetPackage="android".

This makes the OMS API more consistent: IOverlayManager.getAllOverlays
and "adb exec-out cmd overlay list" now no longer hides anything from
the caller, as was already the case for "adb exec-out cmd overlay dump"
and IOverlayManager.getOverlayInfo.

Test: manual: prepare file system, check output of adb exec-out cmd overlay list
Change-Id: I5aec941f6fd1e653910e02ed459b61f30949f8f8
This commit is contained in:
Mårten Kongstad
2018-06-07 14:57:03 +02:00
committed by Todd Kennedy
parent 8c12dcd11a
commit 84638af35a
1 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/om/OverlayManagerSettings.java
View File

@@ -179,19 +179,13 @@ 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() && "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() && "android".equals(i.getTargetPackageName())))
.map(SettingsItem::getOverlayInfo)
.collect(Collectors.groupingBy(info -> info.targetPackageName, ArrayMap::new,
Collectors.toList()));