commit 97db693d0ba5ebbe78df3058f5ce2133a6511d18
author Mathieu Chartier <mathieuc@google.com> Thu Jun 30 12:35:00 2016 -0700
committer Mathieu Chartier <mathieuc@google.com> Fri Jul 08 14:56:43 2016 -0700
tree 2710dc47a9aeb313dc2626315c326e0dab6f3831
parent c9bb73fb516ad39cf7a086f328007c45874ba945

Delete DexFile closeguard

Since class unloading deletes class loaders, it can cause CloseGuard
warnings for the dex files in the dex path list. The parent finalizer
can not call close() since the finalizer ordering is not specified.

Test: test-art-host

Bug: 29820420
Change-Id: I1aac0c3062e9256c96905328ee066570bd878d18

dalvik/src/main/java/dalvik/system/DexFile.java

diff --git a/dalvik/src/main/java/dalvik/system/DexFile.java b/dalvik/src/main/java/dalvik/system/DexFile.java
index 29609d7..a4870ae 100644
--- a/dalvik/src/main/java/dalvik/system/DexFile.java
+++ b/dalvik/src/main/java/dalvik/system/DexFile.java
@@ -41,7 +41,6 @@
     private Object mCookie;
     private Object mInternalCookie;
     private final String mFileName;
-    private final CloseGuard guard = CloseGuard.get();
 
     /**
      * Opens a DEX file from a given File object. This will usually be a ZIP/JAR
@@ -113,7 +112,6 @@
         mCookie = openDexFile(fileName, null, 0, loader, elements);
         mInternalCookie = mCookie;
         mFileName = fileName;
-        guard.open("close");
         //System.out.println("DEX FILE cookie is " + mCookie + " fileName=" + fileName);
     }
 
@@ -250,7 +248,6 @@
             if (closeDexFile(mInternalCookie)) {
                 mInternalCookie = null;
             }
-            guard.close();
             mCookie = null;
         }
     }
@@ -349,9 +346,6 @@
      */
     @Override protected void finalize() throws Throwable {
         try {
-            if (guard != null) {
-                guard.warnIfOpen();
-            }
             if (mInternalCookie != null && !closeDexFile(mInternalCookie)) {
                 throw new AssertionError("Failed to close dex file in finalizer.");
             }