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

Commit af2ba835 authored by Mike Lockwood's avatar Mike Lockwood Committed by Android (Google) Code Review
Browse files

Merge "MTP: Add try/finally handling to finalize overrides"

parents 3a23a3f3 dbead321

media/java/android/media/MtpClient.java

+6 −2
Original line number Diff line number Diff line
@@ -41,8 +41,12 @@ public class MtpClient { 
    }



    @Override

    protected void finalize() {

    protected void finalize() throws Throwable {

        try {

            native_finalize();

        } finally {

            super.finalize();

        }

    }



    public boolean start() {

media/java/android/media/MtpCursor.java

+5 −1
Original line number Diff line number Diff line
@@ -97,7 +97,11 @@ public final class MtpCursor extends AbstractWindowedCursor { 


    @Override

    protected void finalize() {

        try {

            native_finalize();

        } finally {

            super.finalize();

        }

    }



    @Override

media/java/android/media/MtpDatabase.java

+7 −2
Original line number Diff line number Diff line
@@ -86,8 +86,13 @@ public class MtpDatabase { 
    }



    @Override

    protected void finalize() {

    protected void finalize() throws Throwable {

        try {

            native_finalize();

            mDevicePropDb.close();

        } finally {

            super.finalize();

        }

    }



    private int beginSendObject(String path, int format, int parent,

media/java/android/media/MtpServer.java

+6 −2
Original line number Diff line number Diff line
@@ -35,8 +35,12 @@ public class MtpServer { 
    }



    @Override

    protected void finalize() {

    protected void finalize() throws Throwable {

        try {

            native_finalize();

        } finally {

            super.finalize();

        }

    }



    public void start() {