resolved conflicts for merge of 69da8a12 to klp-modular-dev-plus-aosp

Change-Id: Ie07b88f324749afcf8417b50d4dbbc6e2a271a2a

2 files changed, 27 insertions, 11 deletions

diff --git a/core/java/android/os/Build.java b/core/java/android/os/Build.java
index fae2d52..fc4fae2 100644
--- a/core/java/android/os/Build.java
+++ b/core/java/android/os/Build.java
@@ -76,12 +76,38 @@ public class Build {
     public static final String SERIAL = getString("ro.serialno");
 
     /**
-     * A list of ABIs (in priority) order supported by this device.
+     * An ordered list of ABIs supported by this device. The most preferred ABI is the first
+     * element in the list.
+     *
+     * See {@link #SUPPORTED_32_BIT_ABIS} and {@link #SUPPORTED_64_BIT_ABIS}.
      *
      * @hide
      */
     public static final String[] SUPPORTED_ABIS = getString("ro.product.cpu.abilist").split(",");
 
+    /**
+     * An ordered list of <b>32 bit</b> ABIs supported by this device. The most preferred ABI
+     * is the first element in the list.
+     *
+     * See {@link #SUPPORTED_ABIS} and {@link #SUPPORTED_64_BIT_ABIS}.
+     *
+     * @hide
+     */
+    public static final String[] SUPPORTED_32_BIT_ABIS = getString("ro.product.cpu.abilist32")
+            .split(",");
+
+    /**
+     * An ordered list of <b>64 bit</b> ABIs supported by this device. The most preferred ABI
+     * is the first element in the list.
+     *
+     * See {@link #SUPPORTED_ABIS} and {@link #SUPPORTED_32_BIT_ABIS}.
+     *
+     * @hide
+     */
+    public static final String[] SUPPORTED_64_BIT_ABIS = getString("ro.product.cpu.abilist64")
+            .split(",");
+
+
     /** Various version strings. */
     public static class VERSION {
         /**
diff --git a/core/java/android/os/Process.java b/core/java/android/os/Process.java
index b4ed68c..1b3aa0a 100644
--- a/core/java/android/os/Process.java
+++ b/core/java/android/os/Process.java
@@ -707,16 +707,6 @@ public class Process {
             return primaryZygoteState;
         }
 
-        // TODO: Get rid of this. This is a temporary workaround until all the
-        // compilation related pieces for the dual zygote stack are ready.
-        // b/3647418.
-        if (System.getenv("ANDROID_SOCKET_" + SECONDARY_ZYGOTE_SOCKET) == null) {
-            Log.e(LOG_TAG, "Forcing app to primary zygote, secondary unavailable (ABI= " + abi + ")");
-            // Should be :
-            // throw new ZygoteStartFailedEx("Unsupported zygote ABI: " + abi);
-            return primaryZygoteState;
-        }
-
         // The primary zygote didn't match. Try the secondary.
         if (secondaryZygoteState == null || secondaryZygoteState.isClosed()) {
             secondaryZygoteState = ZygoteState.connect(SECONDARY_ZYGOTE_SOCKET,