summaryrefslogtreecommitdiffstats
path: root/src/com/android/gallery3d/data/UriImage.java
diff options
context:
space:
mode:
authorParamananda <parama@codeaurora.org>2015-02-06 18:15:45 +0530
committerParamananda Pradhan <parama@codeaurora.org>2015-02-11 11:08:48 +0530
commit6144de8cc35fdd114802545c9922a1a234af8397 (patch)
tree83c419b8c7c27557965a59f7029ff0d48e00a733 /src/com/android/gallery3d/data/UriImage.java
parent005feabdc6f124da8c37c0aa72216abac9f2b5f2 (diff)
downloadandroid_packages_apps_Gallery2-6144de8cc35fdd114802545c9922a1a234af8397.tar.gz
android_packages_apps_Gallery2-6144de8cc35fdd114802545c9922a1a234af8397.tar.bz2
android_packages_apps_Gallery2-6144de8cc35fdd114802545c9922a1a234af8397.zip
Gallery2 : Added support for Oma drm (CD and SD)
Change-Id: I9c793f85e255e8fd183197410111de2dc618ca76
Diffstat (limited to 'src/com/android/gallery3d/data/UriImage.java')
-rw-r--r--src/com/android/gallery3d/data/UriImage.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/gallery3d/data/UriImage.java b/src/com/android/gallery3d/data/UriImage.java
index fba34a0b3..b9a12e7b7 100644
--- a/src/com/android/gallery3d/data/UriImage.java
+++ b/src/com/android/gallery3d/data/UriImage.java
@@ -19,7 +19,7 @@ package com.android.gallery3d.data;
import android.content.ContentResolver;
import android.content.ContentValues;
import android.database.Cursor;
-import android.drm.DrmManagerClient;
+import android.drm.DrmManagerClientWrapper;
import android.drm.DrmStore.DrmDeliveryType;
import android.graphics.Bitmap;
import android.graphics.Bitmap.Config;
@@ -239,7 +239,7 @@ public class UriImage extends MediaItem {
if (filePath != null && (filePath.endsWith(".dcf") || filePath.endsWith(".dm"))) {
supported |= SUPPORT_DRM_INFO;
filePath = filePath.replace("/storage/emulated/0", "/storage/emulated/legacy");
- DrmManagerClient drmClient = new DrmManagerClient(mApplication.getAndroidContext());
+ DrmManagerClientWrapper drmClient = new DrmManagerClientWrapper(mApplication.getAndroidContext());
ContentValues values = drmClient.getMetadata(filePath);
int drmType = values.getAsInteger("DRM-TYPE");
Log.d(TAG, "getSupportedOperations:drmType returned= "