diff options
| author | 2024-11-15 17:47:31 +0000 | |
|---|---|---|
| committer | 2024-11-15 20:56:54 +0000 | |
| commit | ffe320b468d6f266fe23b18fd117198cb2f68e94 (patch) | |
| tree | e178cf6dc0a3eca6e66868fb8ca71023548f781c | |
| parent | 8c494386365222520a1ef7aa3c83dbaf106eef2d (diff) | |
Flag uses-sdk-library parsing changes
Bug: 379219371
Test: atest ApkLiteParseUtilsTest
FLAG: android.content.pm.sdk_dependency_installer
Change-Id: Icc09b1ab89654c3546722145620ac6b421e2431c
| -rw-r--r-- | core/java/android/content/pm/parsing/ApkLiteParseUtils.java | 3 | ||||
| -rw-r--r-- | core/tests/coretests/src/android/content/pm/parsing/ApkLiteParseUtilsTest.java | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/core/java/android/content/pm/parsing/ApkLiteParseUtils.java b/core/java/android/content/pm/parsing/ApkLiteParseUtils.java index e9e8578af787..05c8f31df5d6 100644 --- a/core/java/android/content/pm/parsing/ApkLiteParseUtils.java +++ b/core/java/android/content/pm/parsing/ApkLiteParseUtils.java @@ -537,6 +537,9 @@ public class ApkLiteParseUtils { hasBindDeviceAdminPermission); break; case TAG_USES_SDK_LIBRARY: + if (!android.content.pm.Flags.sdkDependencyInstaller()) { + break; + } String usesSdkLibName = parser.getAttributeValue( ANDROID_RES_NAMESPACE, "name"); long usesSdkLibVersionMajor = parser.getAttributeIntValue( diff --git a/core/tests/coretests/src/android/content/pm/parsing/ApkLiteParseUtilsTest.java b/core/tests/coretests/src/android/content/pm/parsing/ApkLiteParseUtilsTest.java index 0db49a72c51d..ecacdb2bde0b 100644 --- a/core/tests/coretests/src/android/content/pm/parsing/ApkLiteParseUtilsTest.java +++ b/core/tests/coretests/src/android/content/pm/parsing/ApkLiteParseUtilsTest.java @@ -33,6 +33,7 @@ import android.content.pm.parsing.result.ParseTypeImpl; import android.os.FileUtils; import android.os.ParcelFileDescriptor; import android.platform.test.annotations.Presubmit; +import android.platform.test.annotations.RequiresFlagsEnabled; import android.util.ArraySet; import android.util.PackageUtils; @@ -61,6 +62,7 @@ import java.util.List; import java.util.Set; @Presubmit +@RequiresFlagsEnabled(android.content.pm.Flags.FLAG_SDK_DEPENDENCY_INSTALLER) public class ApkLiteParseUtilsTest { @Rule |