From 6097672947fe8b2632cfd10e3d8e44792199a346 Mon Sep 17 00:00:00 2001
From: Vladimir Marko <vmarko@google.com>
Date: Fri, 6 Apr 2018 15:29:38 +0100
Subject: Remove some unnecessary items from WellKnownClasses.

Replace a few uses with alternatives, namely
mirror::{Constructor,Method,Field}::StaticClass().
Alternatively, we could use class roots in the ClassLinker.

And clear dalvik_system_VMRuntime_nonSdkApiUsageConsumer
in WellKnownClasses::Clear().

Test: testrunner.py --host
Bug: 74943277
Change-Id: I7561db76cd62d376c22efd4386dffd83ec74aa66
---
 runtime/native/java_lang_Class.cc | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

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

diff --git a/runtime/native/java_lang_Class.cc b/runtime/native/java_lang_Class.cc
index a8b203bff2..82300fe9ba 100644
--- a/runtime/native/java_lang_Class.cc
+++ b/runtime/native/java_lang_Class.cc
@@ -683,8 +683,7 @@ static jobject Class_getEnclosingConstructorNative(JNIEnv* env, jobject javaThis
   }
   ObjPtr<mirror::Object> method = annotations::GetEnclosingMethod(klass);
   if (method != nullptr) {
-    if (soa.Decode<mirror::Class>(WellKnownClasses::java_lang_reflect_Constructor) ==
-        method->GetClass()) {
+    if (mirror::Constructor::StaticClass() == method->GetClass()) {
       return soa.AddLocalReference<jobject>(method);
     }
   }
@@ -700,8 +699,7 @@ static jobject Class_getEnclosingMethodNative(JNIEnv* env, jobject javaThis) {
   }
   ObjPtr<mirror::Object> method = annotations::GetEnclosingMethod(klass);
   if (method != nullptr) {
-    if (soa.Decode<mirror::Class>(WellKnownClasses::java_lang_reflect_Method) ==
-        method->GetClass()) {
+    if (mirror::Method::StaticClass() == method->GetClass()) {
       return soa.AddLocalReference<jobject>(method);
     }
   }
-- 
cgit v1.2.3-59-g8ed1b