commit | 06153fae1d743efb4db812755d0ef123e8585e08 | [log] [tgz] |
---|---|---|
author | bohu <bohu@google.com> | Thu Sep 19 11:31:42 2019 -0700 |
committer | Bo Hu <bohu@google.com> | Fri Sep 20 18:45:59 2019 +0000 |
tree | 709e6d13ebcd554bd9671d2a81f570b2fb5743fe | |
parent | 61f405d4afdeb22d89fc87dd2e1f1aa15549b96f [diff] |
Work around is64BitInstructionSet platform api BUG: 139022588 Change-Id: I311b961abe73e71b5c004ba66b920b9bb714ffd0
diff --git a/support/src/test/java/libcore/java/security/CpuFeatures.java b/support/src/test/java/libcore/java/security/CpuFeatures.java index 4c4c8a00..8ab610f 100644 --- a/support/src/test/java/libcore/java/security/CpuFeatures.java +++ b/support/src/test/java/libcore/java/security/CpuFeatures.java
@@ -44,7 +44,7 @@ } } else if (instructionSet.startsWith("x86")) { // x86 CPUs with the "aes" flag and running in 64bit mode should have hardware AES. - if (VMRuntime.is64BitInstructionSet(instructionSet)) { + if ("x86_64".equals(instructionSet)) { List<String> flags = getListFromCpuinfo("flags"); if (flags != null && flags.contains("aes")) { return true;