commit eded9e3b7f6f30526365461a25624b841611af28
author Marco Nelissen <marcone@google.com> Fri Apr 25 14:46:35 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Apr 25 14:46:35 2014 +0000
tree ac464a5b88455b63f9df39a9012bba2d0b6bf97c
parent e3fc3073826b4fdfa0d1be17fe0c79ccf211ad7d
parent adcf38c9936fa372309d413cec03a1413e797c7a

am adcf38c9: Merge "Release DrmManagerClient resources"

* commit 'adcf38c9936fa372309d413cec03a1413e797c7a':
  Release DrmManagerClient resources

media/java/android/media/MediaScanner.java

diff --git a/media/java/android/media/MediaScanner.java b/media/java/android/media/MediaScanner.java
index 53835e2..7502557 100644
--- a/media/java/android/media/MediaScanner.java
+++ b/media/java/android/media/MediaScanner.java
@@ -1280,6 +1280,14 @@
         mMediaProvider = null;
     }
 
+    private void releaseResources() {
+        // release the DrmManagerClient resources
+        if (mDrmManagerClient != null) {
+            mDrmManagerClient.release();
+            mDrmManagerClient = null;
+        }
+    }
+
     private void initialize(String volumeName) {
         mMediaProvider = mContext.getContentResolver().acquireProvider("media");
 
@@ -1340,6 +1348,8 @@
             Log.e(TAG, "UnsupportedOperationException in MediaScanner.scan()", e);
         } catch (RemoteException e) {
             Log.e(TAG, "RemoteException in MediaScanner.scan()", e);
+        } finally {
+            releaseResources();
         }
     }
 
@@ -1363,6 +1373,8 @@
         } catch (RemoteException e) {
             Log.e(TAG, "RemoteException in MediaScanner.scanFile()", e);
             return null;
+        } finally {
+            releaseResources();
         }
     }
 
@@ -1477,6 +1489,7 @@
             if (fileList != null) {
                 fileList.close();
             }
+            releaseResources();
         }
     }