Merge "Conserve order of keys in device build map" into oc-dev am: 49b8ba806d

am: 064dc68f6a

Change-Id: I53afa37ba6128bdde16f7cf6ff271875eb6736ab

1 files changed, 2 insertions, 3 deletions

diff --git a/src/com/android/tradefed/invoker/InvocationContext.java b/src/com/android/tradefed/invoker/InvocationContext.java
index f8a4be437..0ebe25c31 100644
--- a/src/com/android/tradefed/invoker/InvocationContext.java
+++ b/src/com/android/tradefed/invoker/InvocationContext.java
@@ -29,7 +29,6 @@ import com.android.tradefed.util.UniqueMultiMap;
 import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -61,7 +60,7 @@ public class InvocationContext implements IInvocationContext {
      * Creates a {@link BuildInfo} using default attribute values.
      */
     public InvocationContext() {
-        mAllocatedDeviceAndBuildMap = new HashMap<ITestDevice, IBuildInfo>();
+        mAllocatedDeviceAndBuildMap = new LinkedHashMap<ITestDevice, IBuildInfo>();
         // Use LinkedHashMap to ensure key ordering by insertion order
         mNameAndDeviceMap = new LinkedHashMap<String, ITestDevice>();
         mNameAndBuildinfoMap = new LinkedHashMap<String, IBuildInfo>();
@@ -298,7 +297,7 @@ public class InvocationContext implements IInvocationContext {
         // our "pseudo-constructor"
         in.defaultReadObject();
         // now we are a "live" object again, so let's init the transient field
-        mAllocatedDeviceAndBuildMap = new HashMap<ITestDevice, IBuildInfo>();
+        mAllocatedDeviceAndBuildMap = new LinkedHashMap<ITestDevice, IBuildInfo>();
         mNameAndDeviceMap = new LinkedHashMap<String, ITestDevice>();
     }
 }