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

Commit 1506d2f5 authored by Alex Johnston's avatar Alex Johnston Committed by Automerger Merge Worker
Browse files

Merge "Log metric when generateKeyPair throws exception" into sc-dev am: c9f7796a 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13806832

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I718fc59b2e9111f66414d276a343aaa41e82f3ee
parents 3a5a2a67 c9f7796a

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

+1 −1
Original line number Diff line number Diff line
@@ -5774,6 +5774,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { 
                if (generationResult != KeyChain.KEY_GEN_SUCCESS) {

                    Log.e(LOG_TAG, String.format(

                            "KeyChain failed to generate a keypair, error %d.", generationResult));

                    logGenerateKeyPairFailure(caller, isCredentialManagementApp);

                    switch (generationResult) {

                        case KeyChain.KEY_GEN_STRONGBOX_UNAVAILABLE:

                            throw new ServiceSpecificException(
@@ -5783,7 +5784,6 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { 
                            throw new UnsupportedOperationException(

                                "Device does not support Device ID attestation.");

                        default:

                            logGenerateKeyPairFailure(caller, isCredentialManagementApp);

                            return false;

                    }

                }