commit 82cc2a247d9fb9bb8d1d28a09d978f66d0b1c4dd
author Orion Hodson <oth@google.com> Tue Apr 07 21:04:17 2020 +0100
committer Orion Hodson <oth@google.com> Wed Apr 08 19:54:37 2020 +0000
tree 2b4b5dce1ea153af57fb4237d70490bcb12b45e5
parent 3949e5ed86cb752125c7b545ed5c59edfa80580a

Remove FileDescriptor ownerId field from Core Platform API bypass

Bug: 151443957
Test: art/tools/run-libcore-tests.sh --mode=device --variant=X64 -- libcore.libcore.io
Change-Id: I99797c5894308c0c6227ec00f0d9ebfc1c7b8d25

runtime/hidden_api.cc

diff --git a/runtime/hidden_api.cc b/runtime/hidden_api.cc
index f33600f..1e7e21f 100644
--- a/runtime/hidden_api.cc
+++ b/runtime/hidden_api.cc
@@ -123,7 +123,6 @@
   // API that cannot be otherwise expressed and propagated through tooling (b/144502743).
   jfieldID private_core_platform_api_fields[] = {
     WellKnownClasses::java_io_FileDescriptor_descriptor,
-    WellKnownClasses::java_io_FileDescriptor_ownerId,
     WellKnownClasses::java_nio_Buffer_address,
     WellKnownClasses::java_nio_Buffer_elementSizeShift,
     WellKnownClasses::java_nio_Buffer_limit,

runtime/well_known_classes.cc

diff --git a/runtime/well_known_classes.cc b/runtime/well_known_classes.cc
index 27eb28a..1a3a292 100644
--- a/runtime/well_known_classes.cc
+++ b/runtime/well_known_classes.cc
@@ -132,7 +132,6 @@
 jfieldID WellKnownClasses::dalvik_system_DexPathList__Element_dexFile;
 jfieldID WellKnownClasses::dalvik_system_VMRuntime_nonSdkApiUsageConsumer;
 jfieldID WellKnownClasses::java_io_FileDescriptor_descriptor;
-jfieldID WellKnownClasses::java_io_FileDescriptor_ownerId;
 jfieldID WellKnownClasses::java_lang_Thread_parkBlocker;
 jfieldID WellKnownClasses::java_lang_Thread_daemon;
 jfieldID WellKnownClasses::java_lang_Thread_group;
@@ -423,7 +422,6 @@
 
   ScopedLocalRef<jclass> java_io_FileDescriptor(env, env->FindClass("java/io/FileDescriptor"));
   java_io_FileDescriptor_descriptor = CacheField(env, java_io_FileDescriptor.get(), false, "descriptor", "I");
-  java_io_FileDescriptor_ownerId = CacheField(env, java_io_FileDescriptor.get(), false, "ownerId", "J");
 
   java_lang_Thread_parkBlocker = CacheField(env, java_lang_Thread, false, "parkBlocker", "Ljava/lang/Object;");
   java_lang_Thread_daemon = CacheField(env, java_lang_Thread, false, "daemon", "Z");
@@ -550,7 +548,6 @@
   dalvik_system_VMRuntime_runFinalization = nullptr;
   dalvik_system_VMRuntime_hiddenApiUsed = nullptr;
   java_io_FileDescriptor_descriptor = nullptr;
-  java_io_FileDescriptor_ownerId = nullptr;
   java_lang_Boolean_valueOf = nullptr;
   java_lang_Byte_valueOf = nullptr;
   java_lang_Character_valueOf = nullptr;

runtime/well_known_classes.h

diff --git a/runtime/well_known_classes.h b/runtime/well_known_classes.h
index fe17849..34d2e85 100644
--- a/runtime/well_known_classes.h
+++ b/runtime/well_known_classes.h
@@ -145,7 +145,6 @@
   static jfieldID dalvik_system_DexPathList__Element_dexFile;
   static jfieldID dalvik_system_VMRuntime_nonSdkApiUsageConsumer;
   static jfieldID java_io_FileDescriptor_descriptor;
-  static jfieldID java_io_FileDescriptor_ownerId;
   static jfieldID java_lang_Thread_parkBlocker;
   static jfieldID java_lang_Thread_daemon;
   static jfieldID java_lang_Thread_group;