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

Commit 955b8209 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

Change-Id: I8c901d37c99d1e144c7b2cdf2d66531eee02bb3c
parents c3ede0cd cefe0c65

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();

        }

    }