diff options
Diffstat (limited to 'src/com/android/gallery3d/app/GalleryActivity.java')
| -rw-r--r-- | src/com/android/gallery3d/app/GalleryActivity.java | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/com/android/gallery3d/app/GalleryActivity.java b/src/com/android/gallery3d/app/GalleryActivity.java index e04f8fdaf..d8ce7867b 100644 --- a/src/com/android/gallery3d/app/GalleryActivity.java +++ b/src/com/android/gallery3d/app/GalleryActivity.java @@ -24,6 +24,7 @@ import android.content.DialogInterface.OnCancelListener; import android.content.Intent; import android.database.Cursor; import android.drm.DrmManagerClient; +import android.drm.DrmManagerClientWrapper; import android.drm.DrmStore.Action; import android.drm.DrmStore.DrmDeliveryType; import android.drm.DrmStore.RightsStatus; @@ -251,12 +252,8 @@ public final class GalleryActivity extends AbstractGalleryActivity implements On Log.d(TAG,"imagePath=" + imagePath); if (intent.getBooleanExtra("WidgetClick", false) == true) { - DrmManagerClient drmClient = new DrmManagerClient(this); - - // This hack is added to work FL. It will remove after the sdcard permission issue solved + DrmManagerClientWrapper drmClient = new DrmManagerClientWrapper(this); int status = drmClient.checkRightsStatus(imagePath, Action.DISPLAY); - status = RightsStatus.RIGHTS_VALID; - if (RightsStatus.RIGHTS_VALID != status) { ContentValues values = drmClient.getMetadata(imagePath); String address = values.getAsString("Rights-Issuer"); @@ -270,7 +267,7 @@ public final class GalleryActivity extends AbstractGalleryActivity implements On if (imagePath != null && (imagePath.endsWith(".dcf") || imagePath.endsWith(".dm"))) { - DrmManagerClient drmClient = new DrmManagerClient(this); + DrmManagerClientWrapper drmClient = new DrmManagerClientWrapper(this); imagePath = imagePath.replace("/storage/emulated/0", "/storage/emulated/legacy"); ContentValues values = drmClient.getMetadata(imagePath); int drmType = values.getAsInteger("DRM-TYPE"); |