diff options
Diffstat (limited to 'src/com/android/gallery3d/data')
4 files changed, 8 insertions, 13 deletions
diff --git a/src/com/android/gallery3d/data/ImageCacheRequest.java b/src/com/android/gallery3d/data/ImageCacheRequest.java index f93f6e28a..8fb418dd7 100644 --- a/src/com/android/gallery3d/data/ImageCacheRequest.java +++ b/src/com/android/gallery3d/data/ImageCacheRequest.java @@ -16,7 +16,7 @@ package com.android.gallery3d.data; -import android.drm.DrmManagerClient; +import android.drm.DrmManagerClientWrapper; import android.drm.DrmStore.Action; import android.drm.DrmStore.RightsStatus; import android.graphics.Bitmap; @@ -61,15 +61,10 @@ abstract class ImageCacheRequest implements Job<Bitmap> { ImageCacheService cacheService = mApplication.getImageCacheService(); if (mFilePath != null && mFilePath.endsWith(".dcf")) { - DrmManagerClient drmClient = new DrmManagerClient(mApplication.getAndroidContext()); + DrmManagerClientWrapper drmClient = new DrmManagerClientWrapper(mApplication.getAndroidContext()); mFilePath = mFilePath.replace("/storage/emulated/0", "/storage/emulated/legacy"); - - // This hack is added to work FL. It will remove after the sdcard permission issue solved int statusDisplay = drmClient.checkRightsStatus(mFilePath, Action.DISPLAY); - statusDisplay = RightsStatus.RIGHTS_VALID; int statusPlay = drmClient.checkRightsStatus(mFilePath, Action.PLAY); - statusPlay = RightsStatus.RIGHTS_VALID; - if (mMimeType == null) { if ((RightsStatus.RIGHTS_VALID != statusDisplay) && (RightsStatus.RIGHTS_VALID != statusPlay)) { diff --git a/src/com/android/gallery3d/data/LocalImage.java b/src/com/android/gallery3d/data/LocalImage.java index 32c4880d7..96ab3e3a1 100644 --- a/src/com/android/gallery3d/data/LocalImage.java +++ b/src/com/android/gallery3d/data/LocalImage.java @@ -20,7 +20,7 @@ import android.annotation.TargetApi; 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.BitmapFactory; @@ -242,7 +242,7 @@ public class LocalImage extends LocalMediaItem { if (filePath != null && (filePath.endsWith(".dcf") || filePath.endsWith(".dm"))) { filePath = filePath.replace("/storage/emulated/0", "/storage/emulated/legacy"); operation |= SUPPORT_DRM_INFO; - 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= " diff --git a/src/com/android/gallery3d/data/LocalVideo.java b/src/com/android/gallery3d/data/LocalVideo.java index d5e21e983..12b3c7acd 100644 --- a/src/com/android/gallery3d/data/LocalVideo.java +++ b/src/com/android/gallery3d/data/LocalVideo.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.BitmapRegionDecoder; @@ -189,7 +189,7 @@ public class LocalVideo extends LocalMediaItem { int supported = SUPPORT_DELETE | SUPPORT_PLAY | SUPPORT_INFO; if (filePath != null && (filePath.endsWith(".dcf") || filePath.endsWith(".dm"))) { supported |= SUPPORT_DRM_INFO; - 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("LocalVideo", "getSupportedOperations:drmType returned= " 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= " |