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

Reviewed-by: prr, aivanov

Author: Harshitha Onkar

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 @@ static boolean currentMacOSXVersionMatchesGivenVersionRange(
             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 = AccessController.doPrivileged(new GetPropertyAction("os.version"));
+        String osVersion = System.getProperty("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;
-                }
-            });
+        System.loadLibrary("osx");
     }
 
     /**

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;
-                }
-            });
+        System.loadLibrary("osxui");
     }
 
     // TODO: Un-comment this out when the native version exists

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

@@ -27,11 +27,11 @@
 
 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,22 +82,12 @@ public static IconUIResource getLockImageIcon() {
         return getAppIconCompositedOn(lockIcon);
     }
 
-    @SuppressWarnings("removal")
     static Image getGenericJavaIcon() {
-        return java.security.AccessController.doPrivileged(new PrivilegedAction<Image>() {
-            public Image run() {
-                return com.apple.eawt.Application.getApplication().getDockIconImage();
-            }
-        });
+        return Application.getApplication().getDockIconImage();
     }
 
-    @SuppressWarnings("removal")
     static String getPathToThisApplication() {
-        return java.security.AccessController.doPrivileged(new PrivilegedAction<String>() {
-            public String run() {
-                return FileManager.getPathToApplicationBundle();
-            }
-        });
+        return FileManager.getPathToApplicationBundle();
     }
 
     static IconUIResource getAppIconCompositedOn(final SystemIcon systemIcon) {

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

@@ -154,22 +154,10 @@ public boolean isSupportedLookAndFeel() {
      * @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;
-            }
-        });
+        System.loadLibrary("osxui");
+        JRSUIControl.initJRSUI();
 
         super.initialize();
         final ScreenPopupFactory spf = new ScreenPopupFactory();

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

@@ -29,7 +29,6 @@
 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.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;
-        });
+        System.loadLibrary("osxui");
     }
 
     // Utilities
@@ -151,7 +145,6 @@ public static final boolean isScreenMenuBar(final JMenuBar c) {
     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(
-                AquaLookAndFeel.sPropertyPrefix + "useScreenMenuBar"));
+        return Boolean.getBoolean(AquaLookAndFeel.sPropertyPrefix + "useScreenMenuBar");
     }
 }

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

@@ -32,16 +32,10 @@
 
 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;
-                }
-            });
+        System.loadLibrary("osxui");
     }
 
     // TODO: removing CColorPaint for now

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

@@ -27,7 +27,6 @@
 
 import java.awt.*;
 import java.beans.*;
-import java.security.AccessController;
 
 import javax.swing.*;
 import javax.swing.border.Border;
@@ -38,7 +37,6 @@
 
 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 @@ private static JRSUIConstants.Size getSizeFromString(final String name) {
     }
 
     private static Size getDefaultSize() {
-        @SuppressWarnings("removal")
-        final String sizeProperty = AccessController.doPrivileged(
-                new GetPropertyAction(SYSTEM_PROPERTY_KEY));
+        final String sizeProperty = System.getProperty(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.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.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 @@ V get(final K key) {
     private static final RecyclableSingleton<Boolean> enableAnimations = new RecyclableSingleton<Boolean>() {
         @Override
         protected Boolean getInstance() {
-            @SuppressWarnings("removal")
-            final String sizeProperty = (String) AccessController.doPrivileged((PrivilegedAction<?>)new GetPropertyAction(
-                    ANIMATIONS_PROPERTY));
+            final String sizeProperty = System.getProperty(ANIMATIONS_PROPERTY);
             return !"false".equals(sizeProperty); // should be true by default
         }
     };
@@ -332,25 +327,17 @@ public void paintBorder(final Component c, final Graphics g, final int x, final
         }
     }
 
-    @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 });
-                            method.setAccessible(true);
-                            return method;
-                        } catch (final Throwable ignored) {
-                            return null;
-                        }
-                    }
-                }
-            );
+            try {
+                final Method method = JComponent.class.getDeclaredMethod(
+                        "getFlag", new Class<?>[]{int.class});
+                method.setAccessible(true);
+                return method;
+            } catch (final Throwable ignored) {
+                return null;
+            }
         }
     };
 

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;
-                }
-            });
+        System.loadLibrary("awt");
     }
 
     // screen menu stuff