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

Commit 5c807b4e authored by Jeff Brown's avatar Jeff Brown Committed by Android (Google) Code Review
Browse files

Merge "Fix improper use of CloseGuard." into jb-mr1-dev

parents 233c6670 3e7e7f02

core/java/android/view/DisplayEventReceiver.java

+9 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ public abstract class DisplayEventReceiver { 
    @Override

    protected void finalize() throws Throwable {

        try {

            dispose();

            dispose(true);

        } finally {

            super.finalize();

        }
@@ -76,9 +76,17 @@ public abstract class DisplayEventReceiver { 
     * Disposes the receiver.

     */

    public void dispose() {

        dispose(false);

    }



    private void dispose(boolean finalized) {

        if (mCloseGuard != null) {

            if (finalized) {

                mCloseGuard.warnIfOpen();

            }

            mCloseGuard.close();

        }



        if (mReceiverPtr != 0) {

            nativeDispose(mReceiverPtr);

            mReceiverPtr = 0;

core/java/android/view/InputEventReceiver.java

+9 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ public abstract class InputEventReceiver { 
    @Override

    protected void finalize() throws Throwable {

        try {

            dispose();

            dispose(true);

        } finally {

            super.finalize();

        }
@@ -83,9 +83,17 @@ public abstract class InputEventReceiver { 
     * Disposes the receiver.

     */

    public void dispose() {

        dispose(false);

    }



    private void dispose(boolean finalized) {

        if (mCloseGuard != null) {

            if (finalized) {

                mCloseGuard.warnIfOpen();

            }

            mCloseGuard.close();

        }



        if (mReceiverPtr != 0) {

            nativeDispose(mReceiverPtr);

            mReceiverPtr = 0;