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

Merge "Address API review for admin-granted permissions" into sc-dev

Browse Source
This commit is contained in:
Eran Messeri
2021-04-11 11:44:26 +00:00
committed by Android (Google) Code Review
parent cb382990cf 1663624e5d
commit 9ac9fe53bf
4 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/api/current.txt
View File

@@ -7399,7 +7399,7 @@ package android.app.admin {
field public static final String EXTRA_PROVISIONING_LOGO_URI = "android.app.extra.PROVISIONING_LOGO_URI"; field public static final String EXTRA_PROVISIONING_LOGO_URI = "android.app.extra.PROVISIONING_LOGO_URI";
field @Deprecated public static final String EXTRA_PROVISIONING_MAIN_COLOR = "android.app.extra.PROVISIONING_MAIN_COLOR"; field @Deprecated public static final String EXTRA_PROVISIONING_MAIN_COLOR = "android.app.extra.PROVISIONING_MAIN_COLOR";
field public static final String EXTRA_PROVISIONING_MODE = "android.app.extra.PROVISIONING_MODE"; field public static final String EXTRA_PROVISIONING_MODE = "android.app.extra.PROVISIONING_MODE";
field public static final String EXTRA_PROVISIONING_PERMISSION_GRANT_OPT_OUT = "android.app.extra.PROVISIONING_PERMISSION_GRANT_OPT_OUT"; field public static final String EXTRA_PROVISIONING_SENSORS_PERMISSION_GRANT_OPT_OUT = "android.app.extra.PROVISIONING_SENSORS_PERMISSION_GRANT_OPT_OUT";
field public static final String EXTRA_PROVISIONING_SERIAL_NUMBER = "android.app.extra.PROVISIONING_SERIAL_NUMBER"; field public static final String EXTRA_PROVISIONING_SERIAL_NUMBER = "android.app.extra.PROVISIONING_SERIAL_NUMBER";
field public static final String EXTRA_PROVISIONING_SKIP_EDUCATION_SCREENS = "android.app.extra.PROVISIONING_SKIP_EDUCATION_SCREENS"; field public static final String EXTRA_PROVISIONING_SKIP_EDUCATION_SCREENS = "android.app.extra.PROVISIONING_SKIP_EDUCATION_SCREENS";
field public static final String EXTRA_PROVISIONING_SKIP_ENCRYPTION = "android.app.extra.PROVISIONING_SKIP_ENCRYPTION"; field public static final String EXTRA_PROVISIONING_SKIP_ENCRYPTION = "android.app.extra.PROVISIONING_SKIP_ENCRYPTION";

8
core/java/android/app/admin/DevicePolicyManager.java
View File

@@ -991,8 +991,8 @@ public class DevicePolicyManager {
* <p>Use only for device owner provisioning. * <p>Use only for device owner provisioning.
* @see #ACTION_GET_PROVISIONING_MODE * @see #ACTION_GET_PROVISIONING_MODE
*/ */
public static final String EXTRA_PROVISIONING_PERMISSION_GRANT_OPT_OUT = public static final String EXTRA_PROVISIONING_SENSORS_PERMISSION_GRANT_OPT_OUT =
"android.app.extra.PROVISIONING_PERMISSION_GRANT_OPT_OUT"; "android.app.extra.PROVISIONING_SENSORS_PERMISSION_GRANT_OPT_OUT";
/** /**
* A String extra holding the URL-safe base64 encoded SHA-256 checksum of any signature of the * A String extra holding the URL-safe base64 encoded SHA-256 checksum of any signature of the
@@ -10963,8 +10963,8 @@ public class DevicePolicyManager {
* <p> * <p>
* A device owner, by default, may continue granting these permissions. However, for increased * A device owner, by default, may continue granting these permissions. However, for increased
* user control, the admin may opt out of controlling grants for these permissions by including * user control, the admin may opt out of controlling grants for these permissions by including
* {@link #EXTRA_PROVISIONING_PERMISSION_GRANT_OPT_OUT} in the provisioning parameters. In that * {@link #EXTRA_PROVISIONING_SENSORS_PERMISSION_GRANT_OPT_OUT} in the provisioning parameters.
* case the device owner's control will be limited do denying these permissions. * In that case the device owner's control will be limited do denying these permissions.
* <p> * <p>
* Attempts by the admin to grant these permissions, when the admin is restricted from doing * Attempts by the admin to grant these permissions, when the admin is restricted from doing
* so, will be silently ignored (no exception will be thrown). * so, will be silently ignored (no exception will be thrown).

2
core/java/android/app/admin/FullyManagedDeviceProvisioningParams.java
View File

@@ -229,7 +229,7 @@ public final class FullyManagedDeviceProvisioningParams implements Parcelable {
/** /**
* Marks that the Device Owner may grant permissions related to device sensors. * Marks that the Device Owner may grant permissions related to device sensors.
* See {@link DevicePolicyManager#EXTRA_PROVISIONING_PERMISSION_GRANT_OPT_OUT}. * See {@link DevicePolicyManager#EXTRA_PROVISIONING_SENSORS_PERMISSION_GRANT_OPT_OUT}.
*/ */
@NonNull @NonNull
@SuppressLint("MissingGetterMatchingBuilder") @SuppressLint("MissingGetterMatchingBuilder")

5
core/java/android/permission/AdminPermissionControlParams.java
View File

@@ -56,7 +56,8 @@ public final class AdminPermissionControlParams implements Parcelable {
*/ */
public AdminPermissionControlParams(@NonNull String granteePackageName, public AdminPermissionControlParams(@NonNull String granteePackageName,
@NonNull String permission, @NonNull String permission,
int grantState, boolean canAdminGrantSensorsPermissions) { @DevicePolicyManager.PermissionGrantState int grantState,
boolean canAdminGrantSensorsPermissions) {
Preconditions.checkStringNotEmpty(granteePackageName, "Package name must not be empty."); Preconditions.checkStringNotEmpty(granteePackageName, "Package name must not be empty.");
Preconditions.checkStringNotEmpty(permission, "Permission must not be empty."); Preconditions.checkStringNotEmpty(permission, "Permission must not be empty.");
checkArgument(grantState == PERMISSION_GRANT_STATE_GRANTED checkArgument(grantState == PERMISSION_GRANT_STATE_GRANTED
@@ -112,7 +113,7 @@ public final class AdminPermissionControlParams implements Parcelable {
} }
/** Returns the grant state */ /** Returns the grant state */
public int getGrantState() { public @DevicePolicyManager.PermissionGrantState int getGrantState() {
return mGrantState; return mGrantState;
} }