summaryrefslogtreecommitdiff
path: root/drm/java
diff options
context:
space:
mode:
Diffstat (limited to 'drm/java')
-rw-r--r--drm/java/android/drm/DrmManagerClient.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/drm/java/android/drm/DrmManagerClient.java b/drm/java/android/drm/DrmManagerClient.java
index 5973d3e33323..76eab4a7905a 100644
--- a/drm/java/android/drm/DrmManagerClient.java
+++ b/drm/java/android/drm/DrmManagerClient.java
@@ -262,7 +262,10 @@ public class DrmManagerClient implements AutoCloseable {
@Override
protected void finalize() throws Throwable {
try {
- mCloseGuard.warnIfOpen();
+ if (mCloseGuard != null) {
+ mCloseGuard.warnIfOpen();
+ }
+
close();
} finally {
super.finalize();