From e9818ddd70565d52cc1cc93d6991d7e7ec2bc275 Mon Sep 17 00:00:00 2001
From: Stefania Halac <shalac@google.com>
Date: Fri, 14 Feb 2020 17:58:26 +0000
Subject: Revert "Make class loader context fail for unknown class loaders"

This reverts commit 2d3de3a40015af07f7645a298f77b398af0c6c2c.

Reason for revert: 8s regression in boot time b/149517940

Change-Id: I81365d1bd63c691d715b8f970dac9da64ab419ff
---
 runtime/native/dalvik_system_DexFile.cc | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'runtime/native/dalvik_system_DexFile.cc')

diff --git a/runtime/native/dalvik_system_DexFile.cc b/runtime/native/dalvik_system_DexFile.cc
index d2b5edf333..37a524b66d 100644
--- a/runtime/native/dalvik_system_DexFile.cc
+++ b/runtime/native/dalvik_system_DexFile.cc
@@ -576,12 +576,10 @@ static jint GetDexOptNeeded(JNIEnv* env,
     return OatFileAssistant::kNoDexOptNeeded;
   }
 
-  std::vector<int> context_fds;
   return oat_file_assistant.GetDexOptNeeded(filter,
-                                            context.get(),
-                                            context_fds,
                                             profile_changed,
-                                            downgrade);
+                                            downgrade,
+                                            context.get());
 }
 
 static jstring DexFile_getDexFileStatus(JNIEnv* env,
-- 
cgit v1.2.3-59-g8ed1b