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

Commit f1aaff21 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Revert "Allow fabricated RROs to survive a reboot in non-user builds""... 

Merge "Revert "Allow fabricated RROs to survive a reboot in non-user builds"" into main am: 7fe73e95 am: 9c6cd269

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3272733



Change-Id: I44fac9a46e7ebdb753c5f0dd56f1b6266c94bde3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c57c46de 9c6cd269

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

+6 −7
Original line number Diff line number Diff line
@@ -298,13 +298,12 @@ public final class OverlayManagerService extends SystemService { 


            restoreSettings();



            if (Build.IS_USER) {

            // Wipe all shell overlays on boot, to recover from a potentially broken device

            String shellPkgName = TextUtils.emptyIfNull(

                    getContext().getString(android.R.string.config_systemShell));

            mSettings.removeIf(overlayInfo -> overlayInfo.isFabricated

                    && shellPkgName.equals(overlayInfo.packageName));

            }



            initIfNeeded();

            onStartUser(UserHandle.USER_SYSTEM);