From b4680fa4a6f744e329657cd40340586f794b899d Mon Sep 17 00:00:00 2001 From: Patrick Baumann Date: Thu, 19 Sep 2024 18:48:26 +0000 Subject: Revert "Allow fabricated RROs to survive a reboot in non-user builds" This reverts commit a794cdf61c41da3dc066938de56ed8509adb2675. 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 --- .../java/com/android/server/om/OverlayManagerService.java | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/services/core/java/com/android/server/om/OverlayManagerService.java b/services/core/java/com/android/server/om/OverlayManagerService.java index fb2d746ee8cd..872952299055 100644 --- a/services/core/java/com/android/server/om/OverlayManagerService.java +++ b/services/core/java/com/android/server/om/OverlayManagerService.java @@ -289,13 +289,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)); - } + // 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); -- cgit v1.2.3-59-g8ed1b