summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorJohn Wu <topjohnwu@google.com>2021-08-20 19:38:42 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2021-08-20 19:38:42 +0000
commitfcf473ba58b25dbe55f2d767f9252845b15af3be (patch)
tree58646e4fb87ed468cf7dbfb0d0c4432a4760087e /core/java
parent4cffc46ad134bf27b45499f8ad1029f7c6d531d7 (diff)
parent5c65211ec0dd1c7c876603637bce8ca4314cfd07 (diff)
Merge "Introduce the sharedUserMaxSdkVersion attribute"
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/content/pm/parsing/ParsingPackageUtils.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/core/java/android/content/pm/parsing/ParsingPackageUtils.java b/core/java/android/content/pm/parsing/ParsingPackageUtils.java
index 809a544039f9..80befcdf02de 100644
--- a/core/java/android/content/pm/parsing/ParsingPackageUtils.java
+++ b/core/java/android/content/pm/parsing/ParsingPackageUtils.java
@@ -996,6 +996,11 @@ public class ParsingPackageUtils {
private static ParseResult<ParsingPackage> parseSharedUser(ParseInput input,
ParsingPackage pkg, TypedArray sa) {
+ int maxSdkVersion = anInteger(0, R.styleable.AndroidManifest_sharedUserMaxSdkVersion, sa);
+ if ((maxSdkVersion != 0) && maxSdkVersion < Build.VERSION.RESOURCES_SDK_INT) {
+ return input.success(pkg);
+ }
+
String str = nonConfigString(0, R.styleable.AndroidManifest_sharedUserId, sa);
if (TextUtils.isEmpty(str)) {
return input.success(pkg);