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

Commit aefc05c0 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Fix potential double destroy of AssetManager am: 93320661

Change-Id: I929bc83477f4698d78cef92d78934f3dd0b3c140
parents 81db8d8a 93320661
Loading
Loading
Loading
Loading
+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;
        }
    }
}