Removes JRE calls to System.getSecurityManager() and code blocks that depend on a non-null being returned, since on j2objc and Android that method always returns null.

PiperOrigin-RevId: 733090121

Author: tomball

jre_emul/android/platform/external/icu/android_icu4j/src/main/java/android/icu/impl/ClassLoaderUtil.java

@@ -9,8 +9,8 @@
  */
 package android.icu.impl;
 
-import java.security.AccessController;
-import java.security.PrivilegedAction;
+// import java.security.AccessController;
+// import java.security.PrivilegedAction;
 
 
 /**
@@ -53,18 +53,18 @@ private static ClassLoader getBootstrapClassLoader() {
         if (BOOTSTRAP_CLASSLOADER == null) {
             synchronized(ClassLoaderUtil.class) {
                 if (BOOTSTRAP_CLASSLOADER == null) {
-                    ClassLoader cl = null;
-                    if (System.getSecurityManager() != null) {
-                        cl = AccessController.doPrivileged(new PrivilegedAction<ClassLoader>() {
-                            @Override
-                            public BootstrapClassLoader run() {
-                                return new BootstrapClassLoader();
-                            }
-                        });
-                    } else {
-                        cl = new BootstrapClassLoader();
-                    }
-                    BOOTSTRAP_CLASSLOADER = cl;
+                    // ClassLoader cl = null;
+                    // if (System.getSecurityManager() != null) {
+                    //     cl = AccessController.doPrivileged(new PrivilegedAction<ClassLoader>() {
+                    //         @Override
+                    //         public BootstrapClassLoader run() {
+                    //             return new BootstrapClassLoader();
+                    //         }
+                    //     });
+                    // } else {
+                    //     cl = new BootstrapClassLoader();
+                    // }
+                    BOOTSTRAP_CLASSLOADER = new BootstrapClassLoader();
                 }
             }
         }

jre_emul/android/platform/external/icu/android_icu4j/src/main/java/android/icu/impl/ICUConfig.java

@@ -60,8 +60,10 @@ public static String get(String name) {
      * exist, <code>def</code> is returned.
      */
     public static String get(String name, String def) {
+        /* SecurityManager is not supported on j2objc.
         String val = null;
         final String fname = name;
+        
         if (System.getSecurityManager() != null) {
             try {
                 val = AccessController.doPrivileged(new PrivilegedAction<String>() {
@@ -77,7 +79,9 @@ public String run() {
         } else {
             val = System.getProperty(name);
         }
+        */
 
+        String val = System.getProperty(name);
         if (val == null) {
             val = CONFIG_PROPS.getProperty(name, def);
         }

jre_emul/android/platform/external/icu/android_icu4j/src/main/java/android/icu/impl/ICUData.java

@@ -15,8 +15,8 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
+// import java.security.AccessController;
+// import java.security.PrivilegedAction;
 import java.util.MissingResourceException;
 import java.util.logging.Logger;
 
@@ -104,6 +104,7 @@ public final class ICUData {
             Logger.getLogger(ICUData.class.getName()) : null;
 
     public static boolean exists(final String resourceName) {
+        /* SecurityManager is not supported on j2objc.
         URL i = null;
         if (System.getSecurityManager() != null) {
             i = AccessController.doPrivileged(new PrivilegedAction<URL>() {
@@ -115,10 +116,13 @@ public URL run() {
         } else {
             i = ICUData.class.getResource(resourceName);
         }
+        */
+        URL i = ICUData.class.getResource(resourceName);
         return i != null;
     }
 
     private static InputStream getStream(final Class<?> root, final String resourceName, boolean required) {
+        /* SecurityManager is not supported on j2objc.
         InputStream i = null;
         if (System.getSecurityManager() != null) {
             i = AccessController.doPrivileged(new PrivilegedAction<InputStream>() {
@@ -130,7 +134,9 @@ public InputStream run() {
         } else {
             i = root.getResourceAsStream(resourceName);
         }
+        */
 
+        InputStream i = root.getResourceAsStream(resourceName);
         if (i == null && required) {
             throw new MissingResourceException("could not locate data " +resourceName, root.getPackage().getName(), resourceName);
         }
@@ -142,6 +148,7 @@ public InputStream run() {
      * Should be called only from ICUBinary.getData() or from convenience overloads here.
      */
     static InputStream getStream(final ClassLoader loader, final String resourceName, boolean required) {
+        /* SecurityManager is not supported on j2objc.
         InputStream i = null;
         if (System.getSecurityManager() != null) {
             i = AccessController.doPrivileged(new PrivilegedAction<InputStream>() {
@@ -152,7 +159,9 @@ public InputStream run() {
                 });
         } else {
             i = loader.getResourceAsStream(resourceName);
-        }
+        }*/
+
+        InputStream i = loader.getResourceAsStream(resourceName);
         if (i == null && required) {
             throw new MissingResourceException("could not locate data", loader.toString(), resourceName);
         }

jre_emul/android/platform/external/icu/android_icu4j/src/main/java/android/icu/util/ULocale.java

@@ -4108,6 +4108,7 @@ public static boolean isOriginalDefaultLocale(Locale loc) {
         }
 
         public static String getSystemProperty(String key) {
+            /* SecurityManager is not supported on j2objc.
             String val = null;
             final String fkey = key;
             if (System.getSecurityManager() != null) {
@@ -4125,6 +4126,8 @@ public String run() {
                 val = System.getProperty(fkey);
             }
             return val;
+            */
+            return System.getProperty(key);
         }
     }
 }