From 84638af35a15514efd6ad79315dbbb578a92865d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5rten=20Kongstad?= Date: Thu, 7 Jun 2018 14:57:03 +0200 Subject: [PATCH] OMS: never filter out isStatic="true" overlays 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 --- .../java/com/android/server/om/OverlayManagerSettings.java | 6 ------ 1 file changed, 6 deletions(-) diff --git a/services/core/java/com/android/server/om/OverlayManagerSettings.java b/services/core/java/com/android/server/om/OverlayManagerSettings.java index 36bf83dfe92ca..572d368970409 100644 --- a/services/core/java/com/android/server/om/OverlayManagerSettings.java +++ b/services/core/java/com/android/server/om/OverlayManagerSettings.java @@ -179,19 +179,13 @@ final class OverlayManagerSettings { List 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> 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()));