commit adcf38c9936fa372309d413cec03a1413e797c7a
author Marco Nelissen <marcone@google.com> Fri Apr 25 14:42:02 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Apr 25 14:42:02 2014 +0000
tree 88b9e7e7a4097873b16f6f65176bfc35b19dd4e9
parent 8c2d70f5e8dfe64213f44c29562fe4240779b68b
parent 1b37c3bddcdfe7cb60e776e3eb05bfbb46b0b282

Merge "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();
         }
     }