diff options
Diffstat (limited to 'src/com/android/gallery3d/app/PhotoPage.java')
-rwxr-xr-x | src/com/android/gallery3d/app/PhotoPage.java | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/com/android/gallery3d/app/PhotoPage.java b/src/com/android/gallery3d/app/PhotoPage.java index b5a4d5640..7bc9c9d4f 100755 --- a/src/com/android/gallery3d/app/PhotoPage.java +++ b/src/com/android/gallery3d/app/PhotoPage.java @@ -26,7 +26,7 @@ import android.content.Intent; import android.content.pm.PackageManager; import android.content.res.Configuration; 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; @@ -770,7 +770,7 @@ public abstract class PhotoPage extends ActivityState implements } if (filepath != null && filepath.endsWith(".dcf")) { - DrmManagerClient drmClient = new DrmManagerClient(mActivity.getAndroidContext()); + DrmManagerClientWrapper drmClient = new DrmManagerClientWrapper(mActivity.getAndroidContext()); filepath = filepath.replace("/storage/emulated/0", "/storage/emulated/legacy"); ContentValues values = drmClient.getMetadata(filepath); int drmType = values.getAsInteger("DRM-TYPE"); @@ -1433,13 +1433,9 @@ public abstract class PhotoPage extends ActivityState implements path = uri.getPath(); } if (path.endsWith(".dcf")) { - DrmManagerClient drmClient = new DrmManagerClient(activity); + DrmManagerClientWrapper drmClient = new DrmManagerClientWrapper(activity); path = path.replace("/storage/emulated/0", "/storage/emulated/legacy"); - - // This hack is added to work FL. It will remove after the sdcard permission issue solved int status = drmClient.checkRightsStatus(path, Action.PLAY); - status = RightsStatus.RIGHTS_VALID; - if (RightsStatus.RIGHTS_VALID != status) { ContentValues values = drmClient.getMetadata(path); String address = values.getAsString("Rights-Issuer"); |