commit 58fc7f6b7455a0609f52274ef7ddf95f4d8e9d5b
author Amith Yamasani <yamasani@google.com> Sat Oct 14 11:39:16 2023 -0700
committer Amith Yamasani <yamasani@google.com> Sun Oct 15 17:19:09 2023 +0000
tree 35027654d389134ec25ede7809ea7afece338d61
parent 4d2514cc7f48be35d6c6b69e165a6cb4f1e0940c

Fix bootloop when apps are quarantined

Don't check the feature flag when loading xml early in the
boot phase before DeviceConfig is available.

Fixes: 305405837
Test: Flash and reboot
Change-Id: I34648e7d4544e757720e4928f399d4c78bbd5b28

services/core/java/com/android/server/pm/pkg/SuspendParams.java

diff --git a/services/core/java/com/android/server/pm/pkg/SuspendParams.java b/services/core/java/com/android/server/pm/pkg/SuspendParams.java
index 86391c9..153238fa 100644
--- a/services/core/java/com/android/server/pm/pkg/SuspendParams.java
+++ b/services/core/java/com/android/server/pm/pkg/SuspendParams.java
@@ -17,7 +17,6 @@
 package com.android.server.pm.pkg;
 
 import android.annotation.Nullable;
-import android.content.pm.Flags;
 import android.content.pm.SuspendDialogInfo;
 import android.os.BaseBundle;
 import android.os.PersistableBundle;
@@ -142,8 +141,7 @@
         PersistableBundle readAppExtras = null;
         PersistableBundle readLauncherExtras = null;
 
-        final boolean quarantined = in.getAttributeBoolean(null, ATTR_QUARANTINED, false)
-                && Flags.quarantinedEnabled();
+        final boolean quarantined = in.getAttributeBoolean(null, ATTR_QUARANTINED, false);
 
         final int currentDepth = in.getDepth();
         int type;