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

Commit b4680fa4 authored by Patrick Baumann's avatar Patrick Baumann
Browse files

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

This reverts commit a794cdf6.

Reason for revert: Breaks STS. Will need to add special handling for userdebug / eng builds in the STS test. b/367904370

Change-Id: If37d5e3f091774237e4f57eb4763743d1880feb8
Fixes: b/367904370
parent a794cdf6

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

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




            restoreSettings();

            restoreSettings();





            if (Build.IS_USER) {

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

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

            String shellPkgName = TextUtils.emptyIfNull(

            String shellPkgName = TextUtils.emptyIfNull(

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

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

            mSettings.removeIf(overlayInfo -> overlayInfo.isFabricated

            mSettings.removeIf(overlayInfo -> overlayInfo.isFabricated

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

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

            }



            initIfNeeded();

            initIfNeeded();

            onStartUser(UserHandle.USER_SYSTEM);

            onStartUser(UserHandle.USER_SYSTEM);