commit 7fe73e957c8e685c5a77ff22bbf01ab67d2aebb8
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Thu Sep 19 21:27:24 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Sep 19 21:27:24 2024 +0000
tree d1d70d5537f3c4589e4e7dd402427f595ebfb5d7
parent a970bc37fd09032e7528e34e0263a18949122b15
parent b4680fa4a6f744e329657cd40340586f794b899d

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

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

diff --git a/services/core/java/com/android/server/om/OverlayManagerService.java b/services/core/java/com/android/server/om/OverlayManagerService.java
index 59f1e69..56e4590 100644
--- a/services/core/java/com/android/server/om/OverlayManagerService.java
+++ b/services/core/java/com/android/server/om/OverlayManagerService.java
@@ -295,13 +295,12 @@
 
             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);