diff options
Diffstat (limited to 'src/com/android/gallery3d/app/AlbumSetPage.java')
| -rw-r--r-- | src/com/android/gallery3d/app/AlbumSetPage.java | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/com/android/gallery3d/app/AlbumSetPage.java b/src/com/android/gallery3d/app/AlbumSetPage.java index f01585328..b181b59fe 100644 --- a/src/com/android/gallery3d/app/AlbumSetPage.java +++ b/src/com/android/gallery3d/app/AlbumSetPage.java @@ -24,7 +24,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; @@ -286,7 +286,7 @@ public class AlbumSetPage extends ActivityState implements Log.d(TAG, "pickAlbum:path = " + path); if (path != null && (path.endsWith(".dcf") || path.endsWith(".dm"))) { - DrmManagerClient drmClient = new DrmManagerClient(context); + DrmManagerClientWrapper drmClient = new DrmManagerClientWrapper(context); int status = -1; path = path.replace("/storage/emulated/0", "/storage/emulated/legacy"); Log.d(TAG, "pickAlbum:item type = " + Integer.toString(item.getMediaType())); @@ -300,9 +300,6 @@ public class AlbumSetPage extends ActivityState implements 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, "pickAlbum:address = " + address); |