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

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

Merge "Allow fabricated RROs to survive a reboot in non-user builds" into main am: a094d316 

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



Change-Id: I8c18d2f400d5e6c4a96d0f4ad2ea494c727286d0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ce342a8d a094d316

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

+7 −6
Original line number Diff line number Diff line
@@ -295,12 +295,13 @@ 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);