diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2015-02-17 12:33:08 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-02-17 12:33:08 -0800 |
| commit | 5c6ce232af64985c4fb87dfc4b0b0eea8074f767 (patch) | |
| tree | 7d3be829b965382b55225795da20f6e517c449fe /src/com/android/gallery3d/data/ImageCacheRequest.java | |
| parent | efe377dfc29837646e96c479f5c851d4bcb94640 (diff) | |
| parent | 6144de8cc35fdd114802545c9922a1a234af8397 (diff) | |
| download | android_packages_apps_Gallery2-5c6ce232af64985c4fb87dfc4b0b0eea8074f767.tar.gz android_packages_apps_Gallery2-5c6ce232af64985c4fb87dfc4b0b0eea8074f767.tar.bz2 android_packages_apps_Gallery2-5c6ce232af64985c4fb87dfc4b0b0eea8074f767.zip | |
Merge "Gallery2 : Added support for Oma drm (CD and SD)"
Diffstat (limited to 'src/com/android/gallery3d/data/ImageCacheRequest.java')
| -rw-r--r-- | src/com/android/gallery3d/data/ImageCacheRequest.java | 9 |
1 files changed, 2 insertions, 7 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)) { |