From fe259319e6fb90188aea6529b5af6bffd90201e9 Mon Sep 17 00:00:00 2001
From: Daichi Hirono <hirono@google.com>
Date: Wed, 6 Apr 2016 13:00:22 +0900
Subject: [PATCH] Close MTP database when MtpServer's thread is terminated.

Fix: 28030321
Change-Id: I7efe59b651a62ca917ba74312a80b56c0564e060
(cherry picked from commit dd383597c4bd85044bcaf23f1f16489f2c059ae0)
---
 media/java/android/mtp/MtpServer.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/media/java/android/mtp/MtpServer.java b/media/java/android/mtp/MtpServer.java
index 381463011adc1..61fbfb902d0d9 100644
--- a/media/java/android/mtp/MtpServer.java
+++ b/media/java/android/mtp/MtpServer.java
@@ -23,12 +23,14 @@ package android.mtp;
 public class MtpServer implements Runnable {
 
     private long mNativeContext; // accessed by native methods
+    private final MtpDatabase mDatabase;
 
     static {
         System.loadLibrary("media_jni");
     }
 
     public MtpServer(MtpDatabase database, boolean usePtp) {
+        mDatabase = database;
         native_setup(database, usePtp);
         database.setServer(this);
     }
@@ -42,6 +44,7 @@ public class MtpServer implements Runnable {
     public void run() {
         native_run();
         native_cleanup();
+        mDatabase.close();
     }
 
     public void sendObjectAdded(int handle) {