8344060: Remove doPrivileged calls from shared implementation code in the java.desktop module : part 1

src/java.desktop/share/classes/sun/awt/SunToolkit.java

@@ -79,7 +79,6 @@
 import java.io.InputStream;
 import java.lang.reflect.InvocationTargetException;
 import java.net.URL;
-import java.security.AccessController;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Locale;
@@ -100,8 +99,6 @@
 import sun.awt.image.URLImageSource;
 import sun.font.FontDesignMetrics;
 import sun.net.util.URLUtil;
-import sun.security.action.GetBooleanAction;
-import sun.security.action.GetPropertyAction;
 import sun.util.logging.PlatformLogger;
 
 import static java.awt.RenderingHints.KEY_TEXT_ANTIALIASING;
@@ -122,14 +119,12 @@ public abstract class SunToolkit extends Toolkit
         initStatic();
     }
 
-    @SuppressWarnings("removal")
     private static void initStatic() {
-        if (AccessController.doPrivileged(new GetBooleanAction("sun.awt.nativedebug"))) {
+        if (Boolean.getBoolean("sun.awt.nativedebug")) {
             DebugSettings.init();
         }
         touchKeyboardAutoShowIsEnabled = Boolean.parseBoolean(
-            GetPropertyAction.privilegedGetProperty(
-                "awt.touchKeyboardAutoShowIsEnabled", "true"));
+            System.getProperty("awt.touchKeyboardAutoShowIsEnabled", "true"));
     }
 
     /**
@@ -231,9 +226,8 @@ public abstract KeyboardFocusManagerPeer getKeyboardFocusManagerPeer()
      *     }
      */
 
-    @SuppressWarnings("removal")
     private static final ReentrantLock AWT_LOCK = new ReentrantLock(
-            AccessController.doPrivileged(new GetBooleanAction("awt.lock.fair")));
+            Boolean.getBoolean("awt.lock.fair"));
     private static final Condition AWT_LOCK_COND = AWT_LOCK.newCondition();
 
     public static final void awtLock() {
@@ -672,18 +666,16 @@ private void disableBackgroundEraseImpl(Component component) {
      * Returns the value of "sun.awt.noerasebackground" property. Default
      * value is {@code false}.
      */
-    @SuppressWarnings("removal")
     public static boolean getSunAwtNoerasebackground() {
-        return AccessController.doPrivileged(new GetBooleanAction("sun.awt.noerasebackground"));
+        return Boolean.getBoolean("sun.awt.noerasebackground");
     }
 
     /**
      * Returns the value of "sun.awt.erasebackgroundonresize" property. Default
      * value is {@code false}.
      */
-    @SuppressWarnings("removal")
     public static boolean getSunAwtErasebackgroundonresize() {
-        return AccessController.doPrivileged(new GetBooleanAction("sun.awt.erasebackgroundonresize"));
+        return Boolean.getBoolean("sun.awt.erasebackgroundonresize");
     }
 
 
@@ -1157,15 +1149,12 @@ public boolean enableInputMethodsForTextComponent() {
     /**
      * Returns the locale in which the runtime was started.
      */
-    @SuppressWarnings("removal")
     public static Locale getStartupLocale() {
         if (startupLocale == null) {
             String language, region, country, variant;
-            language = AccessController.doPrivileged(
-                            new GetPropertyAction("user.language", "en"));
+            language = System.getProperty("user.language", "en");
             // for compatibility, check for old user.region property
-            region = AccessController.doPrivileged(
-                            new GetPropertyAction("user.region"));
+            region = System.getProperty("user.region");
             if (region != null) {
                 // region can be of form country, country_variant, or _variant
                 int i = region.indexOf('_');
@@ -1177,10 +1166,8 @@ public static Locale getStartupLocale() {
                     variant = "";
                 }
             } else {
-                country = AccessController.doPrivileged(
-                                new GetPropertyAction("user.country", ""));
-                variant = AccessController.doPrivileged(
-                                new GetPropertyAction("user.variant", ""));
+                country = System.getProperty("user.country", "");
+                variant = System.getProperty("user.variant", "");
             }
             startupLocale = Locale.of(language, country, variant);
         }
@@ -1201,9 +1188,7 @@ public Locale getDefaultKeyboardLocale() {
      * @return {@code true}, if XEmbed is needed, {@code false} otherwise
      */
     public static boolean needsXEmbed() {
-        @SuppressWarnings("removal")
-        String noxembed = AccessController.
-            doPrivileged(new GetPropertyAction("sun.awt.noxembed", "false"));
+        String noxembed = System.getProperty("sun.awt.noxembed", "false");
         if ("true".equals(noxembed)) {
             return false;
         }
@@ -1235,9 +1220,8 @@ protected boolean needsXEmbedImpl() {
      * developer.  If true, Toolkit should return an
      * XEmbed-server-enabled CanvasPeer instead of the ordinary CanvasPeer.
      */
-    @SuppressWarnings("removal")
     protected final boolean isXEmbedServerRequested() {
-        return AccessController.doPrivileged(new GetBooleanAction("sun.awt.xembedserver"));
+        return Boolean.getBoolean("sun.awt.xembedserver");
     }
 
     /**
@@ -1756,16 +1740,13 @@ private static RenderingHints getDesktopAAHintsByName(String hintname) {
      * to be inapplicable in that case. In that headless case although
      * this method will return "true" the toolkit will return a null map.
      */
-    @SuppressWarnings("removal")
     private static boolean useSystemAAFontSettings() {
         if (!checkedSystemAAFontSettings) {
             useSystemAAFontSettings = true; /* initially set this true */
             String systemAAFonts = null;
             Toolkit tk = Toolkit.getDefaultToolkit();
             if (tk instanceof SunToolkit) {
-                systemAAFonts =
-                    AccessController.doPrivileged(
-                         new GetPropertyAction("awt.useSystemAAFontSettings"));
+                systemAAFonts = System.getProperty("awt.useSystemAAFontSettings");
             }
             if (systemAAFonts != null) {
                 useSystemAAFontSettings = Boolean.parseBoolean(systemAAFonts);
@@ -1859,11 +1840,9 @@ public static Window getContainingWindow(Component comp) {
      * Returns the value of "sun.awt.disableMixing" property. Default
      * value is {@code false}.
      */
-    @SuppressWarnings("removal")
     public static synchronized boolean getSunAwtDisableMixing() {
         if (sunAwtDisableMixing == null) {
-            sunAwtDisableMixing = AccessController.doPrivileged(
-                                      new GetBooleanAction("sun.awt.disableMixing"));
+            sunAwtDisableMixing = Boolean.getBoolean("sun.awt.disableMixing");
         }
         return sunAwtDisableMixing.booleanValue();
     }

src/java.desktop/share/classes/sun/awt/image/ImageDecoder.java

@@ -159,18 +159,11 @@ protected int imageComplete(int status, boolean done) {
     public abstract void produceImage() throws IOException,
                                                ImageFormatException;
 
-    @SuppressWarnings("removal")
     public void abort() {
         aborted = true;
         source.doneDecoding(this);
         close();
-        java.security.AccessController.doPrivileged(
-            new java.security.PrivilegedAction<Object>() {
-            public Object run() {
-                feeder.interrupt();
-                return null;
-            }
-        });
+        feeder.interrupt();
     }
 
     public synchronized void close() {

src/java.desktop/share/classes/sun/awt/image/ImageFetcher.java

@@ -276,7 +276,6 @@ private static void stoppingAnimation(Thread me) {
     /**
       * Create and start ImageFetcher threads in the appropriate ThreadGroup.
       */
-    @SuppressWarnings("removal")
     private static void createFetchers(final FetcherInfo info) {
        // We need to instantiate a new ImageFetcher thread.
        // First, figure out which ThreadGroup we'll put the
@@ -310,25 +309,18 @@ private static void createFetchers(final FetcherInfo info) {
        }
        final ThreadGroup fetcherGroup = fetcherThreadGroup;
 
-       java.security.AccessController.doPrivileged(
-           new java.security.PrivilegedAction<Object>() {
-               public Object run() {
-                   for (int i = 0; i < info.fetchers.length; i++) {
-                       if (info.fetchers[i] == null) {
-                           ImageFetcher f = new ImageFetcher(fetcherGroup, i);
-                       try {
-                           f.start();
-                           info.fetchers[i] = f;
-                           info.numFetchers++;
-                           break;
-                       } catch (Error e) {
-                       }
-                   }
-                 }
-                 return null;
+       for (int i = 0; i < info.fetchers.length; i++) {
+           if (info.fetchers[i] == null) {
+               ImageFetcher f = new ImageFetcher(fetcherGroup, i);
+               try {
+                   f.start();
+                   info.fetchers[i] = f;
+                   info.numFetchers++;
+                   break;
+               } catch (Error e) {
                }
-           });
-       return;
+           }
+        }
    }
 
 }

src/java.desktop/share/classes/sun/awt/image/ImageWatched.java

@@ -29,10 +29,6 @@
 import java.awt.Image;
 import java.awt.image.ImageObserver;
 
-import java.security.AccessControlContext;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-
 public abstract class ImageWatched {
     public static Link endlink = new Link();
 
@@ -89,28 +85,16 @@ public boolean newInfo(Image img, int info,
         }
     }
 
-    static class AccWeakReference<T> extends WeakReference<T> {
-
-         @SuppressWarnings("removal")
-         private final AccessControlContext acc;
-
-         @SuppressWarnings("removal")
-         AccWeakReference(T ref) {
-             super(ref);
-             acc = AccessController.getContext();
-         }
-    }
-
     /*
      * Standard Link implementation to manage a Weak Reference
      * to an ImageObserver.
      */
     public static class WeakLink extends Link {
-        private final AccWeakReference<ImageObserver> myref;
+        private final WeakReference<ImageObserver> myref;
         private Link next;
 
         public WeakLink(ImageObserver obs, Link next) {
-            myref = new AccWeakReference<ImageObserver>(obs);
+            myref = new WeakReference<ImageObserver>(obs);
             this.next = next;
         }
 
@@ -136,20 +120,6 @@ public Link removeWatcher(ImageObserver iw) {
             return this;
         }
 
-        @SuppressWarnings("removal")
-        private static boolean update(ImageObserver iw, AccessControlContext acc,
-                                      Image img, int info,
-                                      int x, int y, int w, int h) {
-
-            if (acc != null || System.getSecurityManager() != null) {
-                return AccessController.doPrivileged(
-                       (PrivilegedAction<Boolean>) () -> {
-                            return iw.imageUpdate(img, info, x, y, w, h);
-                      }, acc);
-            }
-            return false;
-        }
-
         public boolean newInfo(Image img, int info,
                                int x, int y, int w, int h)
         {
@@ -159,7 +129,7 @@ public boolean newInfo(Image img, int info,
             if (myiw == null) {
                 // My referent is null so we must prune in a second pass.
                 ret = true;
-            } else if (update(myiw, myref.acc, img, info, x, y, w, h) == false) {
+            } else if (myiw.imageUpdate(img, info, x, y, w, h) == false) {
                 // My referent has lost interest so clear it and ask
                 // for a pruning pass to remove it later.
                 myref.clear();

src/java.desktop/share/classes/sun/awt/image/ImagingLib.java

@@ -37,8 +37,6 @@
 import java.awt.image.RasterOp;
 import java.awt.image.Raster;
 import java.awt.image.WritableRaster;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
 
 /**
  * This class provides a hook to access platform-specific
@@ -51,7 +49,7 @@
  * (in which case our java code will be executed) or may throw
  * an exception.
  */
-@SuppressWarnings({"removal", "restricted"})
+@SuppressWarnings("restricted")
 public class ImagingLib {
 
     static boolean useLib = true;
@@ -90,20 +88,14 @@ public static native int lookupByteRaster(Raster src, Raster dst,
 
     static {
 
-        PrivilegedAction<Boolean> doMlibInitialization =
-            new PrivilegedAction<Boolean>() {
-                public Boolean run() {
-                    try {
-                        System.loadLibrary("mlib_image");
-                    } catch (UnsatisfiedLinkError e) {
-                        return Boolean.FALSE;
-                    }
-                    boolean success = init();
-                    return Boolean.valueOf(success);
-                }
-            };
+        boolean success = false;
+        try {
+            System.loadLibrary("mlib_image");
+            success = init();
+        } catch (UnsatisfiedLinkError e) {
+        }
 
-        useLib = AccessController.doPrivileged(doMlibInitialization);
+        useLib = success;
 
         //
         // Cache the class references of the operations we know about

src/java.desktop/share/classes/sun/awt/image/JPEGImageDecoder.java

@@ -42,7 +42,7 @@
  *
  * @author Jim Graham
  */
-@SuppressWarnings({"removal", "restricted"})
+@SuppressWarnings("restricted")
 public class JPEGImageDecoder extends ImageDecoder {
     private static ColorModel RGBcolormodel;
     private static ColorModel ARGBcolormodel;
@@ -54,13 +54,7 @@ public class JPEGImageDecoder extends ImageDecoder {
     private ColorModel colormodel;
 
     static {
-        java.security.AccessController.doPrivileged(
-            new java.security.PrivilegedAction<Void>() {
-                public Void run() {
-                    System.loadLibrary("javajpeg");
-                    return null;
-                }
-            });
+        System.loadLibrary("javajpeg");
         initIDs(InputStreamClass);
         RGBcolormodel = new DirectColorModel(24, 0xff0000, 0xff00, 0xff);
         ARGBcolormodel = ColorModel.getRGBdefault();

src/java.desktop/share/classes/sun/awt/image/NativeLibLoader.java

@@ -52,14 +52,8 @@ class NativeLibLoader {
      * For now, we know it's done by the implementation, and we assume
      * that the name of the library is "awt".  -br.
      */
-    @SuppressWarnings({"removal", "restricted"})
+    @SuppressWarnings("restricted")
     static void loadLibraries() {
-        java.security.AccessController.doPrivileged(
-            new java.security.PrivilegedAction<Void>() {
-                public Void run() {
-                    System.loadLibrary("awt");
-                    return null;
-                }
-            });
+        System.loadLibrary("awt");
     }
 }

src/java.desktop/share/classes/sun/awt/image/VSyncedBSManager.java

@@ -35,11 +35,8 @@ public abstract class VSyncedBSManager {
 
     private static VSyncedBSManager theInstance;
 
-    @SuppressWarnings("removal")
     private static final boolean vSyncLimit =
-        Boolean.parseBoolean(java.security.AccessController.doPrivileged(
-                new sun.security.action.GetPropertyAction(
-                    "sun.java2d.vsynclimit", "true")));
+        Boolean.parseBoolean(System.getProperty("sun.java2d.vsynclimit", "true"));
 
     private static VSyncedBSManager getInstance(boolean create) {
         if (theInstance == null && create) {