diff options
| author | 2024-09-19 22:08:40 +0000 | |
|---|---|---|
| committer | 2024-09-19 22:08:40 +0000 | |
| commit | f1aaff2178f2e12201ec2fd55277fa6ea58b4098 (patch) | |
| tree | 33ba982fe75b09c3af48a8060ae042b38cd18126 | |
| parent | c57c46de45e0ca05b25502e063d6ce5d23d9ff0f (diff) | |
| parent | 9c6cd269e80b2569d3ff10970fb27e929660b0c8 (diff) | |
Merge "Revert "Allow fabricated RROs to survive a reboot in non-user builds"" into main am: 7fe73e957c am: 9c6cd269e8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3272733
Change-Id: I44fac9a46e7ebdb753c5f0dd56f1b6266c94bde3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | services/core/java/com/android/server/om/OverlayManagerService.java | 13 |
1 files 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 a41675a4aac5..6303ecd53dbb 100644 --- a/services/core/java/com/android/server/om/OverlayManagerService.java +++ b/services/core/java/com/android/server/om/OverlayManagerService.java @@ -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)); - } + // 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); |