am b1b3be8e: am eb9c8613: am 024bce82: Merge "Support loading AES keys with authorized digests." into mnc-dev

* commit 'b1b3be8e5b7fadba7428f8c5e9dedaf7f9a9565e':
  Support loading AES keys with authorized digests.

keystore/java/android/security/keystore/KeyProperties.java

@@ -210,10 +210,6 @@ public abstract class KeyProperties {
                 int keymasterAlgorithm, int keymasterDigest) {
             switch (keymasterAlgorithm) {
                 case KeymasterDefs.KM_ALGORITHM_AES:
-                    if (keymasterDigest != -1) {
-                        throw new IllegalArgumentException("Digest not supported for AES key: "
-                                + Digest.fromKeymaster(keymasterDigest));
-                    }
                     return KEY_ALGORITHM_AES;
                 case KeymasterDefs.KM_ALGORITHM_HMAC:
                     switch (keymasterDigest) {