Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Introduce minSdkVersion for <uses-permission>"

Browse Source
This commit is contained in:
Jay Sullivan
2022-08-16 18:13:18 +00:00
committed by Android (Google) Code Review
parent 20a240d08e a9a34bde95
commit c4e0aa3376
2 changed files with 26 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/res/res/values/attrs_manifest.xml
View File

@@ -2175,6 +2175,11 @@
tag; often this is one of the {@link android.Manifest.permission standard
system permissions}. -->
<attr name="name" />
<!-- Optional: specify the minimum version of the Android OS for which the
application wishes to request the permission. When running on a version
of Android lower than the number given here, the permission will not
be requested. -->
<attr name="minSdkVersion" format="integer|string" />
<!-- Optional: specify the maximum version of the Android OS for which the
application wishes to request the permission. When running on a version
of Android higher than the number given here, the permission will not

30
services/core/java/com/android/server/pm/pkg/parsing/ParsingPackageUtils.java
View File

@@ -1256,6 +1256,18 @@ public class ParsingPackageUtils {
return input.success(pkg.addPermission(result.getResult()));
}
private int parseMinOrMaxSdkVersion(TypedArray sa, int attr, int defaultValue) {
int val = defaultValue;
TypedValue peekVal = sa.peekValue(attr);
if (peekVal != null) {
if (peekVal.type >= TypedValue.TYPE_FIRST_INT
&& peekVal.type <= TypedValue.TYPE_LAST_INT) {
val = peekVal.data;
}
}
return val;
}
private ParseResult<ParsingPackage> parseUsesPermission(ParseInput input,
ParsingPackage pkg, Resources res, XmlResourceParser parser)
throws IOException, XmlPullParserException {
@@ -1266,14 +1278,13 @@ public class ParsingPackageUtils {
String name = sa.getNonResourceString(
R.styleable.AndroidManifestUsesPermission_name);
int maxSdkVersion = 0;
TypedValue val = sa.peekValue(
R.styleable.AndroidManifestUsesPermission_maxSdkVersion);
if (val != null) {
if (val.type >= TypedValue.TYPE_FIRST_INT && val.type <= TypedValue.TYPE_LAST_INT) {
maxSdkVersion = val.data;
}
}
int minSdkVersion = parseMinOrMaxSdkVersion(sa,
R.styleable.AndroidManifestUsesPermission_minSdkVersion,
Integer.MIN_VALUE);
int maxSdkVersion = parseMinOrMaxSdkVersion(sa,
R.styleable.AndroidManifestUsesPermission_maxSdkVersion,
Integer.MAX_VALUE);
final ArraySet<String> requiredFeatures = new ArraySet<>();
String feature = sa.getNonConfigurationString(
@@ -1338,7 +1349,8 @@ public class ParsingPackageUtils {
return success;
}
if ((maxSdkVersion != 0) && (maxSdkVersion < Build.VERSION.RESOURCES_SDK_INT)) {
if (Build.VERSION.RESOURCES_SDK_INT < minSdkVersion
|| Build.VERSION.RESOURCES_SDK_INT > maxSdkVersion) {
return success;
}