diff options
| author | Paramananda <parama@codeaurora.org> | 2015-02-06 18:15:45 +0530 |
|---|---|---|
| committer | Paramananda Pradhan <parama@codeaurora.org> | 2015-02-11 11:08:48 +0530 |
| commit | 6144de8cc35fdd114802545c9922a1a234af8397 (patch) | |
| tree | 83c419b8c7c27557965a59f7029ff0d48e00a733 /src/com/android/gallery3d/app/AlbumPage.java | |
| parent | 005feabdc6f124da8c37c0aa72216abac9f2b5f2 (diff) | |
| download | android_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/app/AlbumPage.java')
| -rw-r--r-- | src/com/android/gallery3d/app/AlbumPage.java | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/com/android/gallery3d/app/AlbumPage.java b/src/com/android/gallery3d/app/AlbumPage.java index f6bb47d39..7824bf763 100644 --- a/src/com/android/gallery3d/app/AlbumPage.java +++ b/src/com/android/gallery3d/app/AlbumPage.java @@ -21,7 +21,7 @@ import android.content.Context; import android.content.ContentValues; import android.content.Intent; import android.database.Cursor; -import android.drm.DrmManagerClient; +import android.drm.DrmManagerClientWrapper; import android.drm.DrmRights; import android.drm.DrmStore.Action; import android.drm.DrmStore.DrmDeliveryType; @@ -366,7 +366,7 @@ public class AlbumPage extends ActivityState implements GalleryActionBar.Cluster Log.d(TAG, "pickPhoto:path = " + path); if (path != null && (path.endsWith(".dcf") || path.endsWith(".dm"))) { - DrmManagerClient drmClient = new DrmManagerClient(context); + DrmManagerClientWrapper drmClient = new DrmManagerClientWrapper(context); path = path.replace("/storage/emulated/0", "/storage/emulated/legacy"); int status = -1; Log.d(TAG, "pickPhoto:item type = " + Integer.toString(item.getMediaType())); @@ -380,10 +380,6 @@ public class AlbumPage extends ActivityState implements GalleryActionBar.Cluster + Integer.toString(status)); ContentValues values = drmClient.getMetadata(path); - - // This hack is added to work FL. It will remove after the sdcard permission issue solved - status = RightsStatus.RIGHTS_VALID; - if (RightsStatus.RIGHTS_VALID!= status) { String address = values.getAsString("Rights-Issuer"); Log.d(TAG, "pickPhoto:address = " + address); @@ -453,7 +449,7 @@ public class AlbumPage extends ActivityState implements GalleryActionBar.Cluster path = ((LocalMediaItem)item).filePath; } if (path != null && (path.endsWith(".dcf") || path.endsWith(".dm"))) { - DrmManagerClient drmClient = new DrmManagerClient((Context) mActivity); + DrmManagerClientWrapper drmClient = new DrmManagerClientWrapper((Context) mActivity); path = path.replace("/storage/emulated/0", "/storage/emulated/legacy"); ContentValues values = drmClient.getMetadata(path); int drmType = values.getAsInteger("DRM-TYPE"); |