From a9c8b17acf3e40166192bc976067cafa00006cd4 Mon Sep 17 00:00:00 2001 From: Calin Juravle Date: Wed, 6 Jun 2018 06:13:39 -0700 Subject: [PATCH] Remove sun.nio.fs.UnixChannelFactory from preloaded-classes The tests use the preloaded classes to create the core image and that leads to UnixChannelFactory being initialized despite the fact that FileDescriptor is not. This manifests with a null pointer crash in tests. Bug: 80495283 Test: m test-art-host Change-Id: I785104e6c69c605b16357a9557b203b489972261 --- config/preloaded-classes | 1 - config/preloaded-classes-blacklist | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/config/preloaded-classes b/config/preloaded-classes index 86499f8cb6709..2971ef83feb67 100644 --- a/config/preloaded-classes +++ b/config/preloaded-classes @@ -6375,7 +6375,6 @@ sun.nio.fs.LinuxFileSystemProvider sun.nio.fs.NativeBuffer sun.nio.fs.NativeBuffer$Deallocator sun.nio.fs.NativeBuffers -sun.nio.fs.UnixChannelFactory sun.nio.fs.UnixChannelFactory$Flags sun.nio.fs.UnixConstants sun.nio.fs.UnixException diff --git a/config/preloaded-classes-blacklist b/config/preloaded-classes-blacklist index f1408790e0fb7..8b8d640a543b9 100644 --- a/config/preloaded-classes-blacklist +++ b/config/preloaded-classes-blacklist @@ -1,3 +1,4 @@ android.net.ConnectivityThread$Singleton android.os.FileObserver android.widget.Magnifier +sun.nio.fs.UnixChannelFactory