Merge "Gallery2 : Added support for Oma drm (CD and SD)" (5c6ce232) · Commits · e / os / android_packages_apps_Gallery2

src/com/android/gallery3d/app/AlbumPage.java

+3 −7

Original line number	Diff line number	Diff line
		@@ -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");

src/com/android/gallery3d/app/AlbumSetPage.java

+2 −5

Original line number	Diff line number	Diff line
		@@ -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);

src/com/android/gallery3d/app/GalleryActivity.java

+3 −6

Original line number	Diff line number	Diff line
		@@ -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");

src/com/android/gallery3d/app/MovieActivity.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -37,7 +37,7 @@ import android.content.res.Configuration;
		import android.content.SharedPreferences;
		import android.content.pm.ActivityInfo;
		import android.database.Cursor;
		import android.drm.DrmManagerClient;
		import android.drm.DrmManagerClientWrapper;
		import android.drm.DrmStore.DrmDeliveryType;
		import android.graphics.Bitmap;
		import android.graphics.drawable.BitmapDrawable;
		@@ -319,7 +319,7 @@ public class MovieActivity extends Activity {
		}
		Log.d(TAG, "onCreateOptionsMenu= " + path);
		if ((path != null) && ((path.endsWith(".dcf") \|\| path.endsWith(".dm")))) {
		DrmManagerClient drmClient = new DrmManagerClient(this);
		DrmManagerClientWrapper drmClient = new DrmManagerClientWrapper(this);
		ContentValues values = drmClient.getMetadata(path);
		int drmType = values.getAsInteger("DRM-TYPE");
		Log.d(TAG, "onCreateOptionsMenu:DRM-TYPE = " + Integer.toString(drmType));

src/com/android/gallery3d/app/PhotoPage.java

+3 −7

Original line number	Diff line number	Diff line
		@@ -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");