1 files changed, 2 insertions, 0 deletions
diff --git a/src/com/android/providers/media/MtpService.java b/src/com/android/providers/media/MtpService.java
index 74fd747c..e57aa645 100644
--- a/src/com/android/providers/media/MtpService.java
+++ b/src/com/android/providers/media/MtpService.java
@@ -186,6 +186,7 @@ public class MtpService extends Service {
         if (mServer == null && isCurrentUser) {
             Log.d(TAG, "starting MTP server in " + (mPtpMode ? "PTP mode" : "MTP mode"));
             mServer = new MtpServer(mDatabase, mPtpMode);
+            mDatabase.setServer(mServer);
             if (!mMtpDisabled) {
                 addStorageDevicesLocked();
             }
@@ -195,6 +196,7 @@ public class MtpService extends Service {
             // Internally, kernel will close our FD, and server thread will
             // handle cleanup.
             mServer = null;
+            mDatabase.setServer(null);
         }
     }