| commit | a616a8bfd37a1e57f2096502092504e0ca9ceeba | [log] [tgz] |
|---|---|---|
| author | bohu <bohu@google.com> | Sun Sep 22 15:16:21 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Sun Sep 22 15:16:21 2019 -0700 |
| tree | 709e6d13ebcd554bd9671d2a81f570b2fb5743fe | |
| parent | ff51cddb96e26fe96c7bbb051e127810dcc9b36e [diff] | |
| parent | 2b9434264573a721328cf6a3a901713096c46ab0 [diff] |
Work around is64BitInstructionSet platform api am: 06153fae1d am: 2b94342645 Change-Id: Icd19594d7f24c9c6196468868387537ce341b497
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;