Work around is64BitInstructionSet platform api am: 06153fae1dandroid-mainline-10.0.0_r9android-mainline-10.0.0_r7android-mainline-10.0.0_r5android-mainline-10.0.0_r4android-mainline-10.0.0_r10android-10.0.0_r36android-10.0.0_r35android-10.0.0_r34android-10.0.0_r33android-10.0.0_r32android-10.0.0_r31android-10.0.0_r30android10-qpr2-s4-releaseandroid10-qpr2-s3-releaseandroid10-qpr2-s2-releaseandroid10-qpr2-s1-releaseandroid10-qpr2-releaseandroid10-qpr1-mainline-releaseandroid10-mainline-media-release

am: 2b94342645

Change-Id: Icd19594d7f24c9c6196468868387537ce341b497

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;