Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9809aba0 authored by Todd Kennedy's avatar Todd Kennedy
Browse files

Revert "OMS: never filter out isStatic="true" overlays" 

This reverts commit 84638af3.

Reason for revert: b/121350025

Change-Id: I8ebffc7a01a9173043e6d9e16b7547476b57e4f7
parent 84638af3

services/core/java/com/android/server/om/OverlayManagerSettings.java

+6 −0
Original line number Diff line number Diff line
@@ -179,13 +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() && "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()));