8344058: Remove doPrivileged calls from macos platform sources in the java.desktop module

Reviewed-by: prr, aivanov

src/java.desktop/macosx/classes/apple/laf/JRSUIUtils.java

@@ -25,12 +25,9 @@
 
 package apple.laf;
 
-import java.security.AccessController;
-
 import apple.laf.JRSUIConstants.Hit;
 import apple.laf.JRSUIConstants.ScrollBarPart;
 import com.apple.laf.AquaImageFactory.NineSliceMetrics;
-import sun.security.action.GetPropertyAction;
 
 public final class JRSUIUtils {
 
@@ -69,8 +66,7 @@ public final class JRSUIUtils {
             final int majorVersion, final int minorVersion, final boolean inclusive,
             final boolean matchBelow, final boolean matchAbove) {
         // split the "x.y.z" version number
-        @SuppressWarnings("removal")
+        String osVersion = System.getProperty("os.version");
-        String osVersion = AccessController.doPrivileged(new GetPropertyAction("os.version"));
         String[] fragments = osVersion.split("\\.");
 
         if (fragments.length < 2) return false;

src/java.desktop/macosx/classes/com/apple/eio/FileManager.java

@@ -58,15 +58,9 @@ public class FileManager {
         loadOSXLibrary();
     }
 
-    @SuppressWarnings({"removal", "restricted"})
+    @SuppressWarnings("restricted")
     private static void loadOSXLibrary() {
-        java.security.AccessController.doPrivileged(
-            new java.security.PrivilegedAction<Void>() {
-                public Void run() {
         System.loadLibrary("osx");
-                    return null;
-                }
-            });
     }
 
     /**

src/java.desktop/macosx/classes/com/apple/laf/AquaFileView.java

@@ -65,15 +65,9 @@ class AquaFileView extends FileView {
         loadOSXUILibrary();
     }
 
-    @SuppressWarnings({"removal", "restricted"})
+    @SuppressWarnings("restricted")
     private static void loadOSXUILibrary() {
-        java.security.AccessController.doPrivileged(
-            new java.security.PrivilegedAction<Void>() {
-                public Void run() {
         System.loadLibrary("osxui");
-                    return null;
-                }
-            });
     }
 
     // TODO: Un-comment this out when the native version exists

src/java.desktop/macosx/classes/com/apple/laf/AquaImageFactory.java

@@ -27,11 +27,11 @@ package com.apple.laf;
 
 import java.awt.*;
 import java.awt.image.BufferedImage;
-import java.security.PrivilegedAction;
 
 import javax.swing.*;
 import javax.swing.plaf.*;
 
+import com.apple.eawt.Application;
 import sun.lwawt.macosx.LWCToolkit;
 import apple.laf.JRSUIConstants.AlignmentHorizontal;
 import apple.laf.JRSUIConstants.AlignmentVertical;
@@ -82,23 +82,13 @@ public class AquaImageFactory {
         return getAppIconCompositedOn(lockIcon);
     }
 
-    @SuppressWarnings("removal")
     static Image getGenericJavaIcon() {
-        return java.security.AccessController.doPrivileged(new PrivilegedAction<Image>() {
+        return Application.getApplication().getDockIconImage();
-            public Image run() {
-                return com.apple.eawt.Application.getApplication().getDockIconImage();
-            }
-        });
     }
 
-    @SuppressWarnings("removal")
     static String getPathToThisApplication() {
-        return java.security.AccessController.doPrivileged(new PrivilegedAction<String>() {
-            public String run() {
         return FileManager.getPathToApplicationBundle();
     }
-        });
-    }
 
     static IconUIResource getAppIconCompositedOn(final SystemIcon systemIcon) {
         systemIcon.setSize(kAlertIconSize, kAlertIconSize);

src/java.desktop/macosx/classes/com/apple/laf/AquaLookAndFeel.java

@@ -154,22 +154,10 @@ public class AquaLookAndFeel extends BasicLookAndFeel {
      * @see #uninitialize
      * @see UIManager#setLookAndFeel
      */
-    @SuppressWarnings({"removal", "restricted"})
+    @SuppressWarnings("restricted")
     public void initialize() {
-        java.security.AccessController.doPrivileged(new PrivilegedAction<Void>() {
-                public Void run() {
         System.loadLibrary("osxui");
-                    return null;
-                }
-            });
-
-        java.security.AccessController.doPrivileged(new PrivilegedAction<Void>(){
-            @Override
-            public Void run() {
         JRSUIControl.initJRSUI();
-                return null;
-            }
-        });
 
         super.initialize();
         final ScreenPopupFactory spf = new ScreenPopupFactory();

src/java.desktop/macosx/classes/com/apple/laf/AquaMenuBarUI.java

@@ -29,7 +29,6 @@ import java.awt.Component;
 import java.awt.Dimension;
 import java.awt.Graphics;
 import java.awt.MenuBar;
-import java.security.AccessController;
 
 import javax.swing.JComponent;
 import javax.swing.JFrame;
@@ -38,18 +37,13 @@ import javax.swing.plaf.ComponentUI;
 import javax.swing.plaf.basic.BasicMenuBarUI;
 
 import sun.lwawt.macosx.LWCToolkit;
-import sun.security.action.GetBooleanAction;
 
 // MenuBar implementation for Mac L&F
-@SuppressWarnings({"removal", "restricted"})
+@SuppressWarnings("restricted")
 public class AquaMenuBarUI extends BasicMenuBarUI implements ScreenMenuBarProvider {
 
     static {
-        java.security.AccessController.doPrivileged(
-                (java.security.PrivilegedAction<Void>) () -> {
         System.loadLibrary("osxui");
-            return null;
-        });
     }
 
     // Utilities
@@ -151,7 +145,6 @@ public class AquaMenuBarUI extends BasicMenuBarUI implements ScreenMenuBarProvid
     public static boolean getScreenMenuBarProperty() {
         // Do not allow AWT to set the screen menu bar if it's embedded in another UI toolkit
         if (LWCToolkit.isEmbedded()) return false;
-        return AccessController.doPrivileged(new GetBooleanAction(
+        return Boolean.getBoolean(AquaLookAndFeel.sPropertyPrefix + "useScreenMenuBar");
-                AquaLookAndFeel.sPropertyPrefix + "useScreenMenuBar"));
     }
 }

src/java.desktop/macosx/classes/com/apple/laf/AquaNativeResources.java

@@ -32,16 +32,10 @@ import javax.swing.plaf.UIResource;
 
 import com.apple.laf.AquaUtils.RecyclableSingleton;
 
-@SuppressWarnings({"removal", "restricted"})
+@SuppressWarnings("restricted")
 public class AquaNativeResources {
     static {
-        java.security.AccessController.doPrivileged(
-            new java.security.PrivilegedAction<Void>() {
-                public Void run() {
         System.loadLibrary("osxui");
-                    return null;
-                }
-            });
     }
 
     // TODO: removing CColorPaint for now

src/java.desktop/macosx/classes/com/apple/laf/AquaUtilControlSize.java

@@ -27,7 +27,6 @@ package com.apple.laf;
 
 import java.awt.*;
 import java.beans.*;
-import java.security.AccessController;
 
 import javax.swing.*;
 import javax.swing.border.Border;
@@ -38,7 +37,6 @@ import apple.laf.JRSUIConstants.*;
 
 import com.apple.laf.AquaUtils.RecyclableSingleton;
 import com.apple.laf.AquaUtils.RecyclableSingletonFromDefaultConstructor;
-import sun.security.action.GetPropertyAction;
 
 public class AquaUtilControlSize {
     protected static final String CLIENT_PROPERTY_KEY = "JComponent.sizeVariant";
@@ -72,9 +70,7 @@ public class AquaUtilControlSize {
     }
 
     private static Size getDefaultSize() {
-        @SuppressWarnings("removal")
+        final String sizeProperty = System.getProperty(SYSTEM_PROPERTY_KEY);
-        final String sizeProperty = AccessController.doPrivileged(
-                new GetPropertyAction(SYSTEM_PROPERTY_KEY));
         final JRSUIConstants.Size size = getSizeFromString(sizeProperty);
         if (size != null) return size;
         return JRSUIConstants.Size.REGULAR;

src/java.desktop/macosx/classes/com/apple/laf/AquaUtils.java

@@ -29,8 +29,6 @@ import java.awt.*;
 import java.awt.image.*;
 import java.lang.ref.SoftReference;
 import java.lang.reflect.Method;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
 import java.util.*;
 
 import javax.swing.*;
@@ -41,7 +39,6 @@ import sun.awt.AppContext;
 
 import sun.lwawt.macosx.CPlatformWindow;
 import sun.reflect.misc.ReflectUtil;
-import sun.security.action.GetPropertyAction;
 import sun.swing.SwingUtilities2;
 
 import com.apple.laf.AquaImageFactory.SlicedImageControl;
@@ -205,9 +202,7 @@ final class AquaUtils {
     private static final RecyclableSingleton<Boolean> enableAnimations = new RecyclableSingleton<Boolean>() {
         @Override
         protected Boolean getInstance() {
-            @SuppressWarnings("removal")
+            final String sizeProperty = System.getProperty(ANIMATIONS_PROPERTY);
-            final String sizeProperty = (String) AccessController.doPrivileged((PrivilegedAction<?>)new GetPropertyAction(
-                    ANIMATIONS_PROPERTY));
             return !"false".equals(sizeProperty); // should be true by default
         }
     };
@@ -332,26 +327,18 @@ final class AquaUtils {
         }
     }
 
-    @SuppressWarnings("removal")
     private static final RecyclableSingleton<Method> getJComponentGetFlagMethod = new RecyclableSingleton<Method>() {
         @Override
         protected Method getInstance() {
-            return AccessController.doPrivileged(
-                new PrivilegedAction<Method>() {
-                    @Override
-                    public Method run() {
             try {
                 final Method method = JComponent.class.getDeclaredMethod(
-                                    "getFlag", new Class<?>[] { int.class });
+                        "getFlag", new Class<?>[]{int.class});
                 method.setAccessible(true);
                 return method;
             } catch (final Throwable ignored) {
                 return null;
             }
         }
-                }
-            );
-        }
     };
 
     private static final int OPAQUE_SET_FLAG = 24; // private int JComponent.OPAQUE_SET

src/java.desktop/macosx/classes/com/apple/laf/ScreenMenu.java

@@ -45,15 +45,9 @@ final class ScreenMenu extends Menu
         loadAWTLibrary();
     }
 
-    @SuppressWarnings({"removal", "restricted"})
+    @SuppressWarnings("restricted")
     private static void loadAWTLibrary() {
-        java.security.AccessController.doPrivileged(
-            new java.security.PrivilegedAction<Void>() {
-                public Void run() {
         System.loadLibrary("awt");
-                    return null;
-                }
-            });
     }
 
     // screen menu stuff

src/java.desktop/macosx/classes/sun/awt/PlatformGraphicsInfo.java

@@ -27,17 +27,12 @@ package sun.awt;
 
 import java.awt.GraphicsEnvironment;
 import java.awt.Toolkit;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
 
-@SuppressWarnings({"removal", "restricted"})
+@SuppressWarnings({"restricted"})
 public class PlatformGraphicsInfo {
 
     static {
-        AccessController.doPrivileged((PrivilegedAction<Void>) () -> {
             System.loadLibrary("awt");
-            return null;
-        });
     }
 
     public static GraphicsEnvironment createGE() {

src/java.desktop/macosx/classes/sun/font/CFontManager.java

@@ -27,8 +27,6 @@ package sun.font;
 
 import java.awt.*;
 import java.io.File;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Hashtable;
@@ -147,10 +145,7 @@ public final class CFontManager extends SunFontManager {
     protected void registerFontsInDir(final String dirName, boolean useJavaRasterizer,
                                       int fontRank, boolean defer, boolean resolveSymLinks) {
 
-        @SuppressWarnings("removal")
+        String[] files = new File(dirName).list(getTrueTypeFilter());
-        String[] files = AccessController.doPrivileged((PrivilegedAction<String[]>) () -> {
-            return new File(dirName).list(getTrueTypeFilter());
-        });
 
         if (files == null) {
            return;
@@ -205,24 +200,17 @@ public final class CFontManager extends SunFontManager {
     Object waitForFontsToBeLoaded  = new Object();
     private boolean loadedAllFonts = false;
 
-    @SuppressWarnings("removal")
+
     public void loadFonts()
     {
         synchronized(waitForFontsToBeLoaded)
         {
             super.loadFonts();
-            java.security.AccessController.doPrivileged(
-                new java.security.PrivilegedAction<Object>() {
-                    public Object run() {
             if (!loadedAllFonts) {
                 loadNativeFonts();
                 registerItalicDerived();
                 loadedAllFonts = true;
             }
-                        return null;
-                    }
-                }
-            );
 
             String defaultFont = "Lucida Grande";
             String defaultFallback = "Lucida Grande";

src/java.desktop/macosx/classes/sun/java2d/MacOSFlags.java

@@ -25,7 +25,6 @@
 
 package sun.java2d;
 
-import java.security.PrivilegedAction;
 import sun.java2d.metal.MTLGraphicsConfig;
 import sun.java2d.opengl.CGLGraphicsConfig;
 
@@ -83,10 +82,7 @@ public class MacOSFlags {
         return false;
     }
 
-    @SuppressWarnings("removal")
     private static void initJavaFlags() {
-        java.security.AccessController.doPrivileged(
-                (PrivilegedAction<Object>) () -> {
         PropertyState oglState = getBooleanProp("sun.java2d.opengl", PropertyState.UNSPECIFIED);
         PropertyState metalState = getBooleanProp("sun.java2d.metal", PropertyState.UNSPECIFIED);
 
@@ -133,9 +129,6 @@ public class MacOSFlags {
         if (!metalEnabled && !oglEnabled) {
             throw new InternalError("Error - unable to initialize any rendering pipeline.");
         }
-
-                    return null;
-                });
     }
 
     public static boolean isMetalEnabled() {

src/java.desktop/macosx/classes/sun/java2d/metal/MTLGraphicsConfig.java

@@ -58,8 +58,6 @@ import java.awt.image.DirectColorModel;
 import java.awt.image.VolatileImage;
 import java.awt.image.WritableRaster;
 import java.io.File;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
 
 import static sun.java2d.metal.MTLContext.MTLContextCaps.CAPS_EXT_GRAD_SHADER;
 import static sun.java2d.pipe.hw.AccelSurface.TEXTURE;
@@ -73,11 +71,10 @@ public final class MTLGraphicsConfig extends CGraphicsConfig
 {
     private static ImageCapabilities imageCaps = new MTLImageCaps();
 
-    @SuppressWarnings("removal")
+
-    private static final String mtlShadersLib = AccessController.doPrivileged(
+    private static final String mtlShadersLib =
-            (PrivilegedAction<String>) () ->
                     System.getProperty("java.home", "") + File.separator +
-                            "lib" + File.separator + "shaders.metallib");
+                            "lib" + File.separator + "shaders.metallib";
 
 
     private BufferCapabilities bufferCaps;

src/java.desktop/macosx/classes/sun/java2d/metal/MTLRenderQueue.java

@@ -29,9 +29,6 @@ import sun.awt.util.ThreadGroupUtils;
 import sun.java2d.pipe.RenderBuffer;
 import sun.java2d.pipe.RenderQueue;
 
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-
 import static sun.java2d.pipe.BufferedOpCodes.DISPOSE_CONFIG;
 import static sun.java2d.pipe.BufferedOpCodes.SYNC;
 
@@ -46,13 +43,12 @@ public class MTLRenderQueue extends RenderQueue {
     private static MTLRenderQueue theInstance;
     private final QueueFlusher flusher;
 
-    @SuppressWarnings("removal")
     private MTLRenderQueue() {
         /*
          * The thread must be a member of a thread group
          * which will not get GCed before VM exit.
          */
-        flusher = AccessController.doPrivileged((PrivilegedAction<QueueFlusher>) QueueFlusher::new);
+        flusher = new QueueFlusher();
     }
 
     /**

src/java.desktop/macosx/classes/sun/lwawt/LWComponentPeer.java

@@ -58,8 +58,6 @@ import java.awt.peer.ComponentPeer;
 import java.awt.peer.ContainerPeer;
 import java.awt.peer.KeyboardFocusManagerPeer;
 import java.lang.reflect.Field;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import javax.swing.JComponent;
@@ -260,10 +258,7 @@ public abstract class LWComponentPeer<T extends Component, D extends JComponent>
      * This method must be called under Toolkit.getDefaultToolkit() lock
      * and followed by setToolkitAWTEventListener()
      */
-    @SuppressWarnings("removal")
     protected final AWTEventListener getToolkitAWTEventListener() {
-        return AccessController.doPrivileged(new PrivilegedAction<AWTEventListener>() {
-            public AWTEventListener run() {
         Toolkit toolkit = Toolkit.getDefaultToolkit();
         try {
             Field field = Toolkit.class.getDeclaredField("eventListener");
@@ -273,13 +268,8 @@ public abstract class LWComponentPeer<T extends Component, D extends JComponent>
             throw new InternalError(e.toString());
         }
     }
-        });
-    }
 
-    @SuppressWarnings("removal")
     protected final void setToolkitAWTEventListener(final AWTEventListener listener) {
-        AccessController.doPrivileged(new PrivilegedAction<Void>() {
-            public Void run() {
         Toolkit toolkit = Toolkit.getDefaultToolkit();
         try {
             Field field = Toolkit.class.getDeclaredField("eventListener");
@@ -288,9 +278,6 @@ public abstract class LWComponentPeer<T extends Component, D extends JComponent>
         } catch (Exception e) {
             throw new InternalError(e.toString());
         }
-                return null;
-            }
-        });
     }
 
     /**

src/java.desktop/macosx/classes/sun/lwawt/LWToolkit.java

@@ -31,7 +31,6 @@ import java.awt.datatransfer.*;
 import java.awt.dnd.DropTarget;
 import java.awt.image.*;
 import java.awt.peer.*;
-import java.security.*;
 import java.util.*;
 
 import sun.awt.*;
@@ -69,10 +68,8 @@ public abstract class LWToolkit extends SunToolkit implements Runnable {
      * This method waits for the toolkit to be completely initialized
      * and returns before the message pump is started.
      */
-    @SuppressWarnings("removal")
     protected final void init() {
         AWTAutoShutdown.notifyToolkitThreadBusy();
-        AccessController.doPrivileged((PrivilegedAction<Void>) () -> {
         Runnable shutdownRunnable = () -> {
             shutdown();
             waitForRunState(STATE_CLEANUP);
@@ -88,8 +85,6 @@ public abstract class LWToolkit extends SunToolkit implements Runnable {
         toolkitThread.setDaemon(true);
         toolkitThread.setPriority(Thread.NORM_PRIORITY + 1);
         toolkitThread.start();
-            return null;
-        });
         waitForRunState(STATE_MESSAGELOOP);
     }
 

src/java.desktop/macosx/classes/sun/lwawt/macosx/CAccessibility.java

@@ -77,16 +77,10 @@ class CAccessibility implements PropertyChangeListener {
         loadAWTLibrary();
     }
 
-    @SuppressWarnings({"removal", "restricted"})
+    @SuppressWarnings("restricted")
     private static void loadAWTLibrary() {
             // Need to load the native library for this code.
-        java.security.AccessController.doPrivileged(
-            new java.security.PrivilegedAction<Void>() {
-                public Void run() {
             System.loadLibrary("awt");
-                    return null;
-                }
-            });
     }
 
     static CAccessibility sAccessibility;

src/java.desktop/macosx/classes/sun/lwawt/macosx/CDragSourceContextPeer.java

@@ -59,8 +59,7 @@ public final class CDragSourceContextPeer extends SunDragSourceContextPeer {
     private static double fMaxImageSize = 128.0;
 
     static {
-        @SuppressWarnings("removal")
+        String propValue = System.getProperty("apple.awt.dnd.defaultDragImageSize");
-        String propValue = java.security.AccessController.doPrivileged(new sun.security.action.GetPropertyAction("apple.awt.dnd.defaultDragImageSize"));
         if (propValue != null) {
             try {
                 double value = Double.parseDouble(propValue);

src/java.desktop/macosx/classes/sun/lwawt/macosx/CFileDialog.java

@@ -51,12 +51,10 @@ import java.awt.peer.ContainerPeer;
 import java.awt.peer.FileDialogPeer;
 import java.io.File;
 import java.io.FilenameFilter;
-import java.security.AccessController;
 import java.util.List;
 
 import sun.awt.AWTAccessor;
 import sun.java2d.pipe.Region;
-import sun.security.action.GetBooleanAction;
 
 class CFileDialog implements FileDialogPeer {
 
@@ -65,12 +63,8 @@ class CFileDialog implements FileDialogPeer {
         @Override
         public void run() {
             try {
-                @SuppressWarnings("removal")
+                boolean navigateApps = !Boolean.getBoolean("apple.awt.use-file-dialog-packages");
-                boolean navigateApps = !AccessController.doPrivileged(
+                boolean chooseDirectories = Boolean.getBoolean("apple.awt.fileDialogForDirectories");
-                        new GetBooleanAction("apple.awt.use-file-dialog-packages"));
-                @SuppressWarnings("removal")
-                boolean chooseDirectories = AccessController.doPrivileged(
-                        new GetBooleanAction("apple.awt.fileDialogForDirectories"));
 
                 int dialogMode = target.getMode();
                 String title = target.getTitle();

src/java.desktop/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java

@@ -46,7 +46,6 @@ import java.awt.event.WindowStateListener;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.lang.reflect.InvocationTargetException;
-import java.security.AccessController;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Comparator;
@@ -70,7 +69,6 @@ import sun.lwawt.LWToolkit;
 import sun.lwawt.LWWindowPeer;
 import sun.lwawt.LWWindowPeer.PeerType;
 import sun.lwawt.PlatformWindow;
-import sun.security.action.GetPropertyAction;
 import sun.util.logging.PlatformLogger;
 
 public class CPlatformWindow extends CFRetainedResource implements PlatformWindow {
@@ -131,9 +129,7 @@ public class CPlatformWindow extends CFRetainedResource implements PlatformWindo
 
     // This system property is named as jdk.* because it is not specific to AWT
     // and it is also used in JavaFX
-    @SuppressWarnings("removal")
+    public static final String MAC_OS_TABBED_WINDOW = System.getProperty("jdk.allowMacOSTabbedWindows");
-    public static final String MAC_OS_TABBED_WINDOW = AccessController.doPrivileged(
-            new GetPropertyAction("jdk.allowMacOSTabbedWindows"));
 
     // Yeah, I know. But it's easier to deal with ints from JNI
     static final int MODELESS = 0;

src/java.desktop/macosx/classes/sun/lwawt/macosx/CPrinterJob.java

@@ -31,8 +31,6 @@ import java.awt.geom.Rectangle2D;
 import java.awt.image.BufferedImage;
 import java.awt.print.*;
 import java.net.URI;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
 import java.util.concurrent.atomic.AtomicReference;
 
 import javax.print.*;
@@ -284,7 +282,6 @@ public final class CPrinterJob extends RasterPrinterJob {
         return destinationAttr;
     }
 
-    @SuppressWarnings("removal")
     @Override
     public void print(PrintRequestAttributeSet attributes) throws PrinterException {
         // NOTE: Some of this code is copied from RasterPrinterJob.
@@ -344,14 +341,7 @@ public final class CPrinterJob extends RasterPrinterJob {
 
                     onEventThread = true;
 
-                    printingLoop = AccessController.doPrivileged(new PrivilegedAction<SecondaryLoop>() {
+                    printingLoop =  Toolkit.getDefaultToolkit().getSystemEventQueue().createSecondaryLoop();
-                        @Override
-                        public SecondaryLoop run() {
-                            return Toolkit.getDefaultToolkit()
-                                    .getSystemEventQueue()
-                                    .createSecondaryLoop();
-                        }
-                    });
 
                     try {
                         // Fire off the print rendering loop on the AppKit thread, and don't have

src/java.desktop/macosx/classes/sun/lwawt/macosx/CTrayIcon.java

@@ -45,8 +45,6 @@ import java.awt.geom.Point2D;
 import java.awt.image.BufferedImage;
 import java.awt.image.ImageObserver;
 import java.awt.peer.TrayIconPeer;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
 
 import javax.swing.Icon;
 import javax.swing.UIManager;
@@ -71,10 +69,7 @@ public class CTrayIcon extends CFRetainedResource implements TrayIconPeer {
     // events between MOUSE_PRESSED and MOUSE_RELEASED for particular button
     private static int mouseClickButtons = 0;
 
-    @SuppressWarnings("removal")
+    private static final boolean useTemplateImages = Boolean.getBoolean("apple.awt.enableTemplateImages");
-    private static final boolean useTemplateImages = AccessController.doPrivileged((PrivilegedAction<Boolean>)
-        () -> Boolean.getBoolean("apple.awt.enableTemplateImages")
-    );
 
     CTrayIcon(TrayIcon target) {
         super(0, true);

src/java.desktop/macosx/classes/sun/lwawt/macosx/LWCToolkit.java

@@ -87,8 +87,6 @@ import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.UndeclaredThrowableException;
 import java.net.MalformedURLException;
 import java.net.URL;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
@@ -146,11 +144,6 @@ public final class LWCToolkit extends LWToolkit {
     static {
         System.err.flush();
 
-        @SuppressWarnings({"removal", "restricted"})
-        ResourceBundle platformResources = java.security.AccessController.doPrivileged(
-                new java.security.PrivilegedAction<ResourceBundle>() {
-            @Override
-            public ResourceBundle run() {
         ResourceBundle platformResources = null;
         try {
             platformResources = ResourceBundle.getBundle("sun.awt.resources.awtosx");
@@ -158,12 +151,7 @@ public final class LWCToolkit extends LWToolkit {
             // No resource file; defaults will be used.
         }
 
-                System.loadLibrary("awt");
+        loadLibrary();
-                System.loadLibrary("fontmanager");
-
-                return platformResources;
-            }
-        });
 
         if (!GraphicsEnvironment.isHeadless() &&
             !PlatformGraphicsInfo.isInAquaSession())
@@ -178,32 +166,28 @@ public final class LWCToolkit extends LWToolkit {
         }
     }
 
+    @SuppressWarnings("restricted")
+    private static void loadLibrary() {
+        System.loadLibrary("awt");
+        System.loadLibrary("fontmanager");
+    }
+
     /*
      * If true  we operate in normal mode and nested runloop is executed in JavaRunLoopMode
      * If false we operate in singleThreaded FX/AWT interop mode and nested loop uses NSDefaultRunLoopMode
      */
-    @SuppressWarnings("removal")
     private static final boolean inAWT
-            = AccessController.doPrivileged(new PrivilegedAction<Boolean>() {
+            = !Boolean.parseBoolean(
-        @Override
-        public Boolean run() {
-            return !Boolean.parseBoolean(
                     System.getProperty("javafx.embed.singleThread", "false"));
-        }
-    });
 
-    @SuppressWarnings("removal")
     public LWCToolkit() {
         final String extraButtons = "sun.awt.enableExtraMouseButtons";
-        AccessController.doPrivileged((PrivilegedAction<Void>) () -> {
             areExtraMouseButtonsEnabled =
                  Boolean.parseBoolean(System.getProperty(extraButtons, "true"));
             //set system property if not yet assigned
-            System.setProperty(extraButtons, ""+areExtraMouseButtonsEnabled);
+            System.setProperty(extraButtons, "" + areExtraMouseButtonsEnabled);
             initAppkit(ThreadGroupUtils.getRootThreadGroup(),
                        GraphicsEnvironment.isHeadless());
-            return null;
-        });
     }
 
     /*
@@ -254,13 +238,9 @@ public final class LWCToolkit extends LWToolkit {
     }
 
     // This is only called from native code.
-    @SuppressWarnings("removal")
     static void systemColorsChanged() {
         EventQueue.invokeLater(() -> {
-            AccessController.doPrivileged( (PrivilegedAction<Object>) () -> {
                 AWTAccessor.getSystemColorAccessor().updateSystemColors();
-                return null;
-            });
         });
     }
 
@@ -592,13 +572,9 @@ public final class LWCToolkit extends LWToolkit {
     private static final String APPKIT_THREAD_NAME = "AppKit Thread";
 
     // Intended to be called from the LWCToolkit.m only.
-    @SuppressWarnings("removal")
     private static void installToolkitThreadInJava() {
         Thread.currentThread().setName(APPKIT_THREAD_NAME);
-        AccessController.doPrivileged((PrivilegedAction<Void>) () -> {
         Thread.currentThread().setContextClassLoader(null);
-            return null;
-        });
     }
 
     @Override