summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Alex Buynytskyy <alexbuy@google.com> 2023-08-21 17:43:48 +0000
committer Alex Buynytskyy <alexbuy@google.com> 2023-08-21 17:45:40 +0000
commit528aed6925f50d9ceefc70b55b442dc50456a81d (patch)
tree803c3b5df5cf39c10b186160b6025a73691ae732
parentf131d8beb2c86ff8610eac35a3db181358d710db (diff)
Check and reset quarantined flag, if feature flag is disabled.
Bug: 269127435 Test: atest PackageManagerTest Change-Id: I4cee5d18b1326923f01826de9c3c543ad0f5e0cb
-rw-r--r--services/core/java/com/android/server/pm/pkg/SuspendParams.java4
1 files changed, 3 insertions, 1 deletions
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 153238fa6866..4e08106ed49a 100644
--- a/services/core/java/com/android/server/pm/pkg/SuspendParams.java
+++ b/services/core/java/com/android/server/pm/pkg/SuspendParams.java
@@ -24,6 +24,7 @@ import android.util.Slog;
import com.android.modules.utils.TypedXmlPullParser;
import com.android.modules.utils.TypedXmlSerializer;
+import com.android.server.pm.Flags;
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
@@ -141,7 +142,8 @@ public final class SuspendParams {
PersistableBundle readAppExtras = null;
PersistableBundle readLauncherExtras = null;
- final boolean quarantined = in.getAttributeBoolean(null, ATTR_QUARANTINED, false);
+ final boolean quarantined = in.getAttributeBoolean(null, ATTR_QUARANTINED, false)
+ && Flags.quarantinedEnabled();
final int currentDepth = in.getDepth();
int type;