Merge "Log metric when generateKeyPair throws exception" into sc-dev (c9f7796a) · Commits · e / os / android_frameworks_base

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -5774,6 +5774,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
	if (generationResult != KeyChain.KEY_GEN_SUCCESS) {		if (generationResult != KeyChain.KEY_GEN_SUCCESS) {
	Log.e(LOG_TAG, String.format(		Log.e(LOG_TAG, String.format(
	"KeyChain failed to generate a keypair, error %d.", generationResult));		"KeyChain failed to generate a keypair, error %d.", generationResult));
			logGenerateKeyPairFailure(caller, isCredentialManagementApp);
	switch (generationResult) {		switch (generationResult) {
	case KeyChain.KEY_GEN_STRONGBOX_UNAVAILABLE:		case KeyChain.KEY_GEN_STRONGBOX_UNAVAILABLE:
	throw new ServiceSpecificException(		throw new ServiceSpecificException(
	@@ -5783,7 +5784,6 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
	throw new UnsupportedOperationException(		throw new UnsupportedOperationException(
	"Device does not support Device ID attestation.");		"Device does not support Device ID attestation.");
	default:		default:
	logGenerateKeyPairFailure(caller, isCredentialManagementApp);
	return false;		return false;
	}		}
	}		}