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

Commit aad7ad46 authored by Eran Messeri's avatar Eran Messeri
Browse files

DPM key grant: Address API review 

Split the single method for granting/revoking key access into two
methods.

Bug: 139091816
Test: cts-tradefed run commandAndExit cts-dev -m CtsDevicePolicyManagerTestCases -t com.android.cts.devicepolicy.MixedDeviceOwnerTest#testSetKeyGrant

Change-Id: I495f35419a5dd1c12e18703f11dd4216a310430d
parent a98e4142

api/current.txt

+2 −1
Original line number Diff line number Diff line
@@ -6725,6 +6725,7 @@ package android.app.admin { 
    method @Nullable public java.util.List<android.os.PersistableBundle> getTrustAgentConfiguration(@Nullable android.content.ComponentName, @NonNull android.content.ComponentName);

    method @NonNull public android.os.Bundle getUserRestrictions(@NonNull android.content.ComponentName);

    method @Nullable public String getWifiMacAddress(@NonNull android.content.ComponentName);

    method public boolean grantKeyPairToApp(@Nullable android.content.ComponentName, @NonNull String, @NonNull String);

    method public boolean hasCaCertInstalled(@Nullable android.content.ComponentName, byte[]);

    method public boolean hasGrantedPolicy(@NonNull android.content.ComponentName, int);

    method public boolean installCaCert(@Nullable android.content.ComponentName, byte[]);
@@ -6771,6 +6772,7 @@ package android.app.admin { 
    method @Nullable public java.util.List<android.app.admin.NetworkEvent> retrieveNetworkLogs(@Nullable android.content.ComponentName, long);

    method @Nullable public java.util.List<android.app.admin.SecurityLog.SecurityEvent> retrievePreRebootSecurityLogs(@NonNull android.content.ComponentName);

    method @Nullable public java.util.List<android.app.admin.SecurityLog.SecurityEvent> retrieveSecurityLogs(@NonNull android.content.ComponentName);

    method public boolean revokeKeyPairFromApp(@Nullable android.content.ComponentName, @NonNull String, @NonNull String);

    method public void setAccountManagementDisabled(@NonNull android.content.ComponentName, String, boolean);

    method public void setAffiliationIds(@NonNull android.content.ComponentName, @NonNull java.util.Set<java.lang.String>);

    method public void setAlwaysOnVpnPackage(@NonNull android.content.ComponentName, @Nullable String, boolean) throws android.content.pm.PackageManager.NameNotFoundException;
@@ -6794,7 +6796,6 @@ package android.app.admin { 
    method @WorkerThread public int setGlobalPrivateDnsModeSpecifiedHost(@NonNull android.content.ComponentName, @NonNull String);

    method public void setGlobalSetting(@NonNull android.content.ComponentName, String, String);

    method public void setKeepUninstalledPackages(@Nullable android.content.ComponentName, @NonNull java.util.List<java.lang.String>);

    method public boolean setKeyGrantForApp(@Nullable android.content.ComponentName, @NonNull String, @NonNull String, boolean);

    method public boolean setKeyPairCertificate(@Nullable android.content.ComponentName, @NonNull String, @NonNull java.util.List<java.security.cert.Certificate>, boolean);

    method public boolean setKeyguardDisabled(@NonNull android.content.ComponentName, boolean);

    method public void setKeyguardDisabledFeatures(@NonNull android.content.ComponentName, int);

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

+41 −7
Original line number Diff line number Diff line
@@ -4991,26 +4991,60 @@ public class DevicePolicyManager { 
     * call {@link android.security.KeyChain#choosePrivateKeyAlias} first.

     *

     * The grantee app will receive the {@link android.security.KeyChain#ACTION_KEY_ACCESS_CHANGED}

     * broadcast when access to a key is granted or revoked.

     * broadcast when access to a key is granted.

     *

     * @param admin Which {@link DeviceAdminReceiver} this request is associated with, or

     *        {@code null} if calling from a delegated certificate installer.

     * @param alias The alias of the key to grant access to.

     * @param packageName The name of the (already installed) package to grant access to.

     * @param hasGrant Whether to grant access to the alias or revoke it.

     * @return {@code true} if the grant was set successfully, {@code false} otherwise.

     *

     * @throws SecurityException if the caller is not a device owner, a profile owner or

     *         delegated certificate chooser.

     * @throws IllegalArgumentException if {@code packageName} or {@code alias} are empty, or if

     *         {@code packageName} is not a name of an installed package.

     * @see #revokeKeyPairFromApp

     */

    public boolean setKeyGrantForApp(@Nullable ComponentName admin, @NonNull String alias,

            @NonNull String packageName, boolean hasGrant) {

        throwIfParentInstance("addKeyGrant");

    public boolean grantKeyPairToApp(@Nullable ComponentName admin, @NonNull String alias,

            @NonNull String packageName) {

        throwIfParentInstance("grantKeyPairToApp");

        try {

            return mService.setKeyGrantForApp(

                    admin, mContext.getPackageName(), alias, packageName, true);

        } catch (RemoteException e) {

            e.rethrowFromSystemServer();

        }

        return false;

    }



    /**

     * Called by a device or profile owner, or delegated certificate chooser (an app that has been

     * delegated the {@link #DELEGATION_CERT_SELECTION} privilege), to revoke an application's

     * grant to a KeyChain key pair.

     * Calls by the application to {@link android.security.KeyChain#getPrivateKey}

     * will fail after the grant is revoked.

     *

     * The grantee app will receive the {@link android.security.KeyChain#ACTION_KEY_ACCESS_CHANGED}

     * broadcast when access to a key is revoked.

     *

     * @param admin Which {@link DeviceAdminReceiver} this request is associated with, or

     *        {@code null} if calling from a delegated certificate installer.

     * @param alias The alias of the key to revoke access from.

     * @param packageName The name of the (already installed) package to revoke access from.

     * @return {@code true} if the grant was revoked successfully, {@code false} otherwise.

     *

     * @throws SecurityException if the caller is not a device owner, a profile owner or

     *         delegated certificate chooser.

     * @throws IllegalArgumentException if {@code packageName} or {@code alias} are empty, or if

     *         {@code packageName} is not a name of an installed package.

     * @see #grantKeyPairToApp

     */

    public boolean revokeKeyPairFromApp(@Nullable ComponentName admin, @NonNull String alias,

            @NonNull String packageName) {

        throwIfParentInstance("revokeKeyPairFromApp");

        try {

            return mService.setKeyGrantForApp(

                    admin, mContext.getPackageName(), alias, packageName, hasGrant);

                    admin, mContext.getPackageName(), alias, packageName, false);

        } catch (RemoteException e) {

            e.rethrowFromSystemServer();

        }