commit a9ff45b9f6d46cf6e48685a1c5d3cd64e05149a6
author atrost <atrost@google.com> Tue Jan 14 15:59:02 2020 +0000
committer Anna Trostanetski <atrost@google.com> Mon Jan 20 16:26:26 2020 +0000
tree 9af811618b7d73319eaeedfa67532bc9d7bce543
parent 6a67bea2203783db7569cd99cc86e2b63f5e28a7

Remove TODO from ART

Doing this directly from frameworks to bionic without ART.
Bug: 145743810
Test: none

Change-Id: I79634c403038fcbe4c2e842980cc4821a6fae027

runtime/native/dalvik_system_VMRuntime.cc

diff --git a/runtime/native/dalvik_system_VMRuntime.cc b/runtime/native/dalvik_system_VMRuntime.cc
index b34d5f4..8dd7ced 100644
--- a/runtime/native/dalvik_system_VMRuntime.cc
+++ b/runtime/native/dalvik_system_VMRuntime.cc
@@ -280,15 +280,13 @@
   if (disabled_compat_changes == nullptr) {
     return;
   }
-  std::set<uint64_t> disabled_compat_changes_vec;
+  std::set<uint64_t> disabled_compat_changes_set;
   int length = env->GetArrayLength(disabled_compat_changes);
   jlong* elements = env->GetLongArrayElements(disabled_compat_changes, /*isCopy*/nullptr);
   for (int i = 0; i < length; i++) {
-    disabled_compat_changes_vec.insert(static_cast<uint64_t>(elements[i]));
+    disabled_compat_changes_set.insert(static_cast<uint64_t>(elements[i]));
   }
-  Runtime::Current()->SetDisabledCompatChanges(disabled_compat_changes_vec);
-
-  // TODO(145743810): pipe into libc as well.
+  Runtime::Current()->SetDisabledCompatChanges(disabled_compat_changes_set);
 }
 
 static inline size_t clamp_to_size_t(jlong n) {