Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 73961397 authored by Rubin Xu's avatar Rubin Xu Committed by Android (Google) Code Review
Browse files

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

parents 4d289593 adaf68cd

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -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);

core/java/android/app/admin/DevicePolicyManager.java

+9 −0
Original line number Diff line number Diff line
@@ -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

core/java/android/content/pm/PackageManager.java

+11 −0
Original line number Diff line number Diff line
@@ -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