Fix potential double destroy of AssetManager am: 93320661ca am: aefc05c016

Change-Id: I52d6c83fd2585d8fdc5917e72e37dd1c2d11f9e0

core/java/android/content/res/AssetManager.java

@@ -588,7 +588,13 @@ public final class AssetManager implements AutoCloseable {
                     }
                 }
             }
-            destroy();
+
+            synchronized (this) {
+                if (mObject != 0) {
+                    destroy();
+                    mObject = 0;
+                }
+            }
         } finally {
             super.finalize();
         }
@@ -907,8 +913,9 @@ public final class AssetManager implements AutoCloseable {
         mNumRefs--;
         //System.out.println("Dec streams: mNumRefs=" + mNumRefs
         //                   + " mReleased=" + mReleased);
-        if (mNumRefs == 0) {
+        if (mNumRefs == 0 && mObject != 0) {
             destroy();
+            mObject = 0;
         }
     }
 }