From 484ea675dd5480db6e272c0fcb46ec5a9d733a24 Mon Sep 17 00:00:00 2001
From: Jerry Zhang <zhangjerry@google.com>
Date: Fri, 2 Mar 2018 15:40:03 -0800
Subject: Check mMediaProvider for null

Getting the content provider could
return null in some cases where the user
is locked, so check for that when closing.

Bug: 73656609
Test: no crash
Change-Id: I607cd2da5348520616a1c171d0d8a1afacabe592
---
 media/java/android/mtp/MtpDatabase.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/media/java/android/mtp/MtpDatabase.java b/media/java/android/mtp/MtpDatabase.java
index a647dcc2d4b9..32a00d597e62 100755
--- 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();
         }
     }
-- 
cgit v1.2.3-59-g8ed1b