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

Commit 66499b45 authored by Jerry Zhang's avatar Jerry Zhang Committed by android-build-merger
Browse files

Merge "Check mMediaProvider for null" into pi-dev am: cefe0c65 

am: 955b8209

Change-Id: If0c3a5c21f23e9aa98dd70bec3678a8785469973
parents a0446aac 955b8209

media/java/android/mtp/MtpDatabase.java

+3 −1
Original line number Diff line number Diff line
@@ -292,7 +292,9 @@ public class MtpDatabase implements AutoCloseable { 
        mCloseGuard.close();

        if (mClosed.compareAndSet(false, true)) {

            mMediaScanner.close();

            if (mMediaProvider != null) {

                mMediaProvider.close();

            }

            native_finalize();

        }

    }