Snap for 5895359 from a616a8bfd37a1e57f2096502092504e0ca9ceeba to qt-qpr1-releaseandroid-10.0.0_r29android-10.0.0_r28android-10.0.0_r27android-10.0.0_r26android-10.0.0_r25android-10.0.0_r24android-10.0.0_r23android-10.0.0_r22android-10.0.0_r21android-10.0.0_r20android-10.0.0_r19android-10.0.0_r18android-10.0.0_r16android-10.0.0_r15android10-qpr1-releaseandroid10-qpr1-d-releaseandroid10-qpr1-c-s1-releaseandroid10-qpr1-c-releaseandroid10-qpr1-b-s1-releaseandroid10-qpr1-b-release

Change-Id: I41d494adba808ea768512f9f7f0623cdcd5a84fa

1 files changed, 1 insertions, 1 deletions

diff --git a/support/src/test/java/libcore/java/security/CpuFeatures.java b/support/src/test/java/libcore/java/security/CpuFeatures.java
index 4c4c8a00c0b..8ab610f0662 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 @@ class CpuFeatures {
             }
         } 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;