From 041f016971710bbae871e3162fc6e13cfab77f17 Mon Sep 17 00:00:00 2001
From: Lev Rumyantsev <levarum@google.com>
Date: Fri, 13 Dec 2019 15:57:18 -0800
Subject: [PATCH] AppZygote: start with the correct instruction set

This allows triggering native-bridge initialization if needed.

Test: CtsExternalServiceTestCases
android.externalservice.cts.ExternalServiceTest
testBindExternalServiceWithZygote
for Q.sdk_gphone_x86_arm.armeabi-v7a
Bug: 143143718

Change-Id: If105c4283879407c4fcee33fa6086772d43609a3
---
 core/java/android/os/AppZygote.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/java/android/os/AppZygote.java b/core/java/android/os/AppZygote.java
index 6daa5b4dc6d8b..92574968e9658 100644
--- a/core/java/android/os/AppZygote.java
+++ b/core/java/android/os/AppZygote.java
@@ -21,6 +21,8 @@ import android.util.Log;
 
 import com.android.internal.annotations.GuardedBy;
 
+import dalvik.system.VMRuntime;
+
 /**
  * AppZygote is responsible for interfacing with an application-specific zygote.
  *
@@ -113,7 +115,7 @@ public class AppZygote {
                     "app_zygote",  // seInfo
                     abi,  // abi
                     abi, // acceptedAbiList
-                    null, // instructionSet
+                    VMRuntime.getInstructionSet(abi), // instructionSet
                     mZygoteUidGidMin,
                     mZygoteUidGidMax);