Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8e5d6a25 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Fix potential double destroy of AssetManager am: 93320661 am: aefc05c0 

Change-Id: I52d6c83fd2585d8fdc5917e72e37dd1c2d11f9e0
parents 5b6d8d77 aefc05c0

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

+39 −32
Original line number Diff line number Diff line
@@ -588,7 +588,13 @@ public final class AssetManager implements AutoCloseable { 
                    }

                }

            }



            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;

        }

    }

}