Simplify internal libcore logging.

Expose LOGE and friends for use from Java. This is handy because it lets me use
printf debugging even when I've broken String or CharsetEncoder or something
equally critical. It also lets us remove internal use of java.util.logging,
which is slow and ugly.

I've also changed Thread.suspend/resume/stop to actually throw
UnsupportedOperationException rather than just logging one and otherwise
doing nothing.

Bug: 3477960
Change-Id: I0c3f804b1a978bf9911cb4a9bfd90b2466f8798f

3 files changed, 6 insertions, 19 deletions

diff --git a/dalvik/src/main/java/dalvik/system/CloseGuard.java b/dalvik/src/main/java/dalvik/system/CloseGuard.java
index b631852..136be2f 100644
--- a/dalvik/src/main/java/dalvik/system/CloseGuard.java
+++ b/dalvik/src/main/java/dalvik/system/CloseGuard.java
@@ -16,9 +16,6 @@
 
 package dalvik.system;
 
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
 /**
  * CloseGuard is a mechanism for flagging implicit finalizer cleanup of
  * resources that should have been cleaned up by explicit close
@@ -223,13 +220,11 @@ public final class CloseGuard {
     }
 
     /**
-     * Default Reporter which uses a Logger to report CloseGuard
-     * violations.
+     * Default Reporter which reports CloseGuard violations to the log.
      */
     private static final class DefaultReporter implements Reporter {
         public void report (String message, Throwable allocationSite) {
-            Logger.getLogger(CloseGuard.class.getName())
-                    .log(Level.WARNING, message, allocationSite);
+            System.logW(message, allocationSite);
         }
     }
 }
diff --git a/dalvik/src/main/java/dalvik/system/DexPathList.java b/dalvik/src/main/java/dalvik/system/DexPathList.java
index 3446fea..1253223 100644
--- a/dalvik/src/main/java/dalvik/system/DexPathList.java
+++ b/dalvik/src/main/java/dalvik/system/DexPathList.java
@@ -23,8 +23,6 @@ import java.net.URL;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Enumeration;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 import java.util.regex.Pattern;
 import java.util.zip.ZipFile;
 
@@ -211,9 +209,7 @@ import java.util.zip.ZipFile;
                 try {
                     dex = loadDexFile(file, optimizedDirectory);
                 } catch (IOException ex) {
-                    Logger.global.log(Level.SEVERE,
-                            "Unable to load dex file: " + file,
-                            ex);
+                    System.logE("Unable to load dex file: " + file, ex);
                 }
             } else if (name.endsWith(APK_SUFFIX) || name.endsWith(JAR_SUFFIX)
                     || name.endsWith(ZIP_SUFFIX)) {
@@ -226,9 +222,7 @@ import java.util.zip.ZipFile;
                      * (e.g. if the file isn't actually a zip/jar
                      * file).
                      */
-                    Logger.global.log(Level.SEVERE,
-                            "Unable to open zip file: " + file,
-                            ex);
+                    System.logE("Unable to open zip file: " + file, ex);
                 }
 
                 try {
@@ -243,7 +237,7 @@ import java.util.zip.ZipFile;
                      */
                 }
             } else {
-                Logger.global.warning("Unknown file type for: " + file);
+                System.logW("Unknown file type for: " + file);
             }
 
             if ((zip != null) || (dex != null)) {
diff --git a/dalvik/src/main/java/dalvik/system/TemporaryDirectory.java b/dalvik/src/main/java/dalvik/system/TemporaryDirectory.java
index 1f2defd..ff0f759 100644
--- a/dalvik/src/main/java/dalvik/system/TemporaryDirectory.java
+++ b/dalvik/src/main/java/dalvik/system/TemporaryDirectory.java
@@ -17,7 +17,6 @@
 package dalvik.system;
 
 import java.io.File;
-import java.util.logging.Logger;
 
 /**
  * Utility class to handle the setup of the core library's concept of
@@ -68,8 +67,7 @@ public class TemporaryDirectory {
      */
     public static synchronized void setUpDirectory(File baseDir) {
         if (configured) {
-            Logger.global.info("Already set to: " +
-                    System.getProperty(PROPERTY));
+            System.logE("Already set to: " + System.getProperty(PROPERTY));
             return;
         }