Merge "Check mMediaProvider for null" into pi-dev

2018-03-06 01:59:14 +00:00
parent 4a3dd2ba58 484ea675dd
commit cefe0c6518
1 changed files with 3 additions and 1 deletions
--- a/media/java/android/mtp/MtpDatabase.java
+++ b/media/java/android/mtp/MtpDatabase.java
@@ -292,7 +292,9 @@ public class MtpDatabase implements AutoCloseable {
        mCloseGuard.close();
        if (mClosed.compareAndSet(false, true)) {
            mMediaScanner.close();
-            mMediaProvider.close();
+            if (mMediaProvider != null) {
+                mMediaProvider.close();
+            }
            native_finalize();
        }
    }