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

Merge "Surface "neverForLocation" through public API." into sc-dev

Browse Source
This commit is contained in:
Jeff Sharkey
2021-03-20 03:01:08 +00:00
committed by Android (Google) Code Review
parent 7d1ca13d41 a57db58f24
commit 7be2cf8c4b
8 changed files with 38 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/api/current.txt
View File

@@ -1581,6 +1581,7 @@ package android {
field public static final int useLevel = 16843167; // 0x101019f
field public static final int userVisible = 16843409; // 0x1010291
field public static final int usesCleartextTraffic = 16844012; // 0x10104ec
field public static final int usesPermissionFlags = 16844356; // 0x1010644
field public static final int value = 16842788; // 0x1010024
field public static final int valueFrom = 16843486; // 0x10102de
field public static final int valueTo = 16843487; // 0x10102df
@@ -12171,6 +12172,7 @@ package android.content.pm {
field public static final int INSTALL_LOCATION_INTERNAL_ONLY = 1; // 0x1
field public static final int INSTALL_LOCATION_PREFER_EXTERNAL = 2; // 0x2
field public static final int REQUESTED_PERMISSION_GRANTED = 2; // 0x2
field public static final int REQUESTED_PERMISSION_NEVER_FOR_LOCATION = 65536; // 0x10000
field public android.content.pm.ActivityInfo[] activities;
field public android.content.pm.ApplicationInfo applicationInfo;
field @Nullable public android.content.pm.Attribution[] attributions;

14
core/java/android/content/pm/PackageInfo.java
View File

@@ -232,13 +232,23 @@ public class PackageInfo implements Parcelable {
*
* @removed We do not support required permissions.
*/
public static final int REQUESTED_PERMISSION_REQUIRED = 1<<0;
public static final int REQUESTED_PERMISSION_REQUIRED = 0x00000001;
/**
* Flag for {@link #requestedPermissionsFlags}: the requested permission
* is currently granted to the application.
*/
public static final int REQUESTED_PERMISSION_GRANTED = 1<<1;
public static final int REQUESTED_PERMISSION_GRANTED = 0x00000002;
/**
* Flag for {@link #requestedPermissionsFlags}: the requested permission has
* declared {@code neverForLocation} in their manifest as a strong assertion
* by a developer that they will never use this permission to derive the
* physical location of the device, regardless of
* {@link android.Manifest.permission#ACCESS_FINE_LOCATION} and/or
* {@link android.Manifest.permission#ACCESS_COARSE_LOCATION} being granted.
*/
public static final int REQUESTED_PERMISSION_NEVER_FOR_LOCATION = 0x00010000;
/**
* Array of all signatures read from the package file. This is only filled

23
core/java/android/content/pm/parsing/PackageInfoWithoutStateUtils.java
View File

@@ -52,6 +52,7 @@ import android.content.pm.parsing.component.ParsedPermission;
import android.content.pm.parsing.component.ParsedPermissionGroup;
import android.content.pm.parsing.component.ParsedProvider;
import android.content.pm.parsing.component.ParsedService;
import android.content.pm.parsing.component.ParsedUsesPermission;
import android.os.Environment;
import android.os.UserHandle;
@@ -61,6 +62,7 @@ import libcore.util.EmptyArray;
import java.io.File;
import java.util.Collections;
import java.util.List;
import java.util.Set;
/** @hide **/
@@ -264,17 +266,26 @@ public class PackageInfoWithoutStateUtils {
flags);
}
}
size = pkg.getRequestedPermissions().size();
final List<ParsedUsesPermission> usesPermissions = pkg.getUsesPermissions();
size = usesPermissions.size();
if (size > 0) {
pi.requestedPermissions = new String[size];
pi.requestedPermissionsFlags = new int[size];
for (int i = 0; i < size; i++) {
final String perm = pkg.getRequestedPermissions().get(i);
pi.requestedPermissions[i] = perm;
final ParsedUsesPermission usesPermission = usesPermissions.get(i);
pi.requestedPermissions[i] = usesPermission.name;
// The notion of required permissions is deprecated but for compatibility.
pi.requestedPermissionsFlags[i] |= PackageInfo.REQUESTED_PERMISSION_REQUIRED;
if (grantedPermissions != null && grantedPermissions.contains(perm)) {
pi.requestedPermissionsFlags[i] |= PackageInfo.REQUESTED_PERMISSION_GRANTED;
pi.requestedPermissionsFlags[i] |=
PackageInfo.REQUESTED_PERMISSION_REQUIRED;
if (grantedPermissions != null
&& grantedPermissions.contains(usesPermission.name)) {
pi.requestedPermissionsFlags[i] |=
PackageInfo.REQUESTED_PERMISSION_GRANTED;
}
if ((usesPermission.usesPermissionFlags
& ParsedUsesPermission.FLAG_NEVER_FOR_LOCATION) != 0) {
pi.requestedPermissionsFlags[i] |=
PackageInfo.REQUESTED_PERMISSION_NEVER_FOR_LOCATION;
}
}
}

4
core/java/android/content/pm/parsing/component/ParsedUsesPermission.java
View File

@@ -20,6 +20,7 @@ import static android.content.pm.parsing.ParsingPackageImpl.sForInternedString;
import android.annotation.IntDef;
import android.annotation.NonNull;
import android.content.pm.PackageInfo;
import android.os.Parcel;
import android.os.Parcelable;
@@ -44,7 +45,8 @@ public class ParsedUsesPermission implements Parcelable {
* to derive the physical location of the device, regardless of
* ACCESS_FINE_LOCATION and/or ACCESS_COARSE_LOCATION being granted.
*/
public static final int FLAG_NEVER_FOR_LOCATION = 0x1;
public static final int FLAG_NEVER_FOR_LOCATION =
PackageInfo.REQUESTED_PERMISSION_NEVER_FOR_LOCATION;
/** @hide */
@Retention(RetentionPolicy.SOURCE)

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

@@ -2063,13 +2063,14 @@
requested. If it does support the feature, it will be as if the manifest didn't
request it at all. -->
<attr name="requiredNotFeature" format="string" />
<!-- Optional: set of flags that should apply to this permission request. -->
<!-- Optional: set of flags that should apply to this permission request. Note that
these flags start at 0x4 to match PackageInfo.requestedPermissionsFlags. -->
<attr name="usesPermissionFlags">
<!-- Strong assertion by a developer that they will never use this
permission to derive the physical location of the device, even
when the app has been granted the ACCESS_FINE_LOCATION and/or
ACCESS_COARSE_LOCATION permissions. -->
<flag name="neverForLocation" value="0x1" />
<flag name="neverForLocation" value="0x00010000" />
</attr>
</declare-styleable>

1
core/res/res/values/public.xml
View File

@@ -3091,6 +3091,7 @@
<public name="isAccessibilityTool"/>
<public name="attributionTags"/>
<public name="suppressesSpellChecker" />
<public name="usesPermissionFlags" />
</public-group>
<public-group type="drawable" first-id="0x010800b5">

8
services/core/java/android/content/pm/PackageManagerInternal.java
View File

@@ -1141,12 +1141,4 @@ public abstract class PackageManagerInternal {
*/
public abstract boolean isPackageFrozen(
@NonNull String packageName, int callingUid, int userId);
/**
* Returns true if the given {@code packageName} has declared the
* {@code neverForLocation} flag in the {@code uses-permission} manifest tag
* where they request the given {@code permissionName}.
*/
public abstract boolean isPackageUsesPermissionNeverForLocation(@NonNull String packageName,
@NonNull String permissionName);
}

23
services/core/java/com/android/server/pm/PackageManagerService.java
View File

@@ -27324,31 +27324,8 @@ public class PackageManagerService extends IPackageManager.Stub
return PackageManagerService.this.getPackageStartability(
packageName, callingUid, userId) == PACKAGE_STARTABILITY_FROZEN;
}
@Override
public boolean isPackageUsesPermissionNeverForLocation(@NonNull String packageName,
@NonNull String permissionName) {
Objects.requireNonNull(packageName);
Objects.requireNonNull(permissionName);
final AndroidPackage pkg;
synchronized (mLock) {
pkg = mPackages.get(packageName);
}
if (pkg == null) return false;
final List<ParsedUsesPermission> usesPermissions = pkg.getUsesPermissions();
final int size = usesPermissions.size();
for (int i = 0; i < size; i++) {
final ParsedUsesPermission usesPermission = usesPermissions.get(i);
if (Objects.equals(usesPermission.name, permissionName)) {
return (usesPermission.usesPermissionFlags
& ParsedUsesPermission.FLAG_NEVER_FOR_LOCATION) != 0;
}
}
return false;
}
}
@GuardedBy("mLock")
private SparseArray<String> getAppsWithSharedUserIdsLocked() {
final SparseArray<String> sharedUserIds = new SparseArray<>();