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

Merge "Device ID attestation: Add feature flag." into pi-dev

Browse Source
This commit is contained in:
Rubin Xu
2018-04-05 09:38:28 +00:00
committed by Android (Google) Code Review
parent 4d289593f2 adaf68cd62
commit 73961397e5
3 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -6511,6 +6511,7 @@ package android.app.admin {
method public boolean isApplicationHidden(android.content.ComponentName, java.lang.String);
method public boolean isBackupServiceEnabled(android.content.ComponentName);
method public deprecated boolean isCallerApplicationRestrictionsManagingPackage();
method public boolean isDeviceIdAttestationSupported();
method public boolean isDeviceOwnerApp(java.lang.String);
method public boolean isEphemeralUser(android.content.ComponentName);
method public boolean isLockTaskPermitted(java.lang.String);

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

@@ -4218,6 +4218,15 @@ public class DevicePolicyManager {
return null;
}
/**
* Returns {@code true} if the device supports attestation of device identifiers in addition
* to key attestation.
* @return {@code true} if Device ID attestation is supported.
*/
public boolean isDeviceIdAttestationSupported() {
PackageManager pm = mContext.getPackageManager();
return pm.hasSystemFeature(PackageManager.FEATURE_DEVICE_ID_ATTESTATION);
}
/**
* Called by a device or profile owner, or delegated certificate installer, to associate

11
core/java/android/content/pm/PackageManager.java
View File

@@ -2628,6 +2628,17 @@ public abstract class PackageManager {
public static final String FEATURE_STRONGBOX_KEYSTORE =
"android.hardware.strongbox_keystore";
/**
* Feature for {@link #getSystemAvailableFeatures} and {@link #hasSystemFeature}:
* The device has a Keymaster implementation that supports Device ID attestation.
*
* @see DevicePolicyManager#isDeviceIdAttestationSupported
* @hide
*/
@SdkConstant(SdkConstantType.FEATURE)
public static final String FEATURE_DEVICE_ID_ATTESTATION =
"android.software.device_id_attestation";
/**
* Action to external storage service to clean out removed apps.
* @hide