From 254edef2cf842102ba18b52a0ef153030429ee82 Mon Sep 17 00:00:00 2001 From: Jackal Guo Date: Sat, 8 May 2021 23:38:03 +0800 Subject: [PATCH] Revert the usage of sCompatibilityModeEnabled Change the usage of global compatibility mode enabled state back to PackageParser first until the tests are ready to ensure the behavior is consistent. Bug: 186592266 Test: atest CtsCompatibilityModeTestCases Change-Id: Ib57886c095a7b2f6e797ccdaa2890f3ad60f5482 --- .../content/pm/parsing/PackageInfoWithoutStateUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/java/android/content/pm/parsing/PackageInfoWithoutStateUtils.java b/core/java/android/content/pm/parsing/PackageInfoWithoutStateUtils.java index 980f10d5e688f..26004ff842a24 100644 --- a/core/java/android/content/pm/parsing/PackageInfoWithoutStateUtils.java +++ b/core/java/android/content/pm/parsing/PackageInfoWithoutStateUtils.java @@ -397,7 +397,7 @@ public class PackageInfoWithoutStateUtils { } // CompatibilityMode is global state. - if (!ParsingPackageUtils.sCompatibilityModeEnabled) { + if (!android.content.pm.PackageParser.sCompatibilityModeEnabled) { ai.disableCompatibilityMode(); }