From e3172febb111f286a37b685938dd930856540d77 Mon Sep 17 00:00:00 2001 From: Chih-Chung Chang Date: Thu, 11 Feb 2010 14:22:47 -0800 Subject: [PATCH] Remove support for DRM images (they are not used now and reference to hidden classes). --- src/com/android/camera/ImageManager.java | 16 +--- src/com/android/camera/gallery/DrmImageList.java | 105 ----------------------- 2 files changed, 1 insertion(+), 120 deletions(-) delete mode 100644 src/com/android/camera/gallery/DrmImageList.java diff --git a/src/com/android/camera/ImageManager.java b/src/com/android/camera/ImageManager.java index 50884ba..958e499 100644 --- a/src/com/android/camera/ImageManager.java +++ b/src/com/android/camera/ImageManager.java @@ -17,7 +17,6 @@ package com.android.camera; import com.android.camera.gallery.BaseImageList; -import com.android.camera.gallery.DrmImageList; import com.android.camera.gallery.IImage; import com.android.camera.gallery.IImageList; import com.android.camera.gallery.ImageList; @@ -37,7 +36,6 @@ import android.net.Uri; import android.os.Environment; import android.os.Parcel; import android.os.Parcelable; -import android.provider.DrmStore; import android.provider.MediaStore; import android.provider.MediaStore.Images; import android.util.Log; @@ -132,7 +130,6 @@ public class ImageManager { // Inclusion public static final int INCLUDE_IMAGES = (1 << 0); - public static final int INCLUDE_DRM_IMAGES = (1 << 1); public static final int INCLUDE_VIDEOS = (1 << 2); // Sort @@ -352,10 +349,6 @@ public class ImageManager { l.add(new ImageList(cr, Images.Media.INTERNAL_CONTENT_URI, sort, bucketId)); } - if ((inclusion & INCLUDE_DRM_IMAGES) != 0) { - l.add(new DrmImageList( - cr, DrmStore.Images.CONTENT_URI, sort, bucketId)); - } } // Optimization: If some of the lists are empty, remove them. @@ -384,14 +377,7 @@ public class ImageManager { int sort) { String uriString = (uri != null) ? uri.toString() : ""; - // TODO: we need to figure out whether we're viewing - // DRM images in a better way. Is there a constant - // for content://drm somewhere?? - - if (uriString.startsWith("content://drm")) { - return makeImageList(cr, DataLocation.ALL, INCLUDE_DRM_IMAGES, sort, - null); - } else if (uriString.startsWith("content://media/external/video")) { + if (uriString.startsWith("content://media/external/video")) { return makeImageList(cr, DataLocation.EXTERNAL, INCLUDE_VIDEOS, sort, null); } else if (isSingleImageMode(uriString)) { diff --git a/src/com/android/camera/gallery/DrmImageList.java b/src/com/android/camera/gallery/DrmImageList.java deleted file mode 100644 index 99a6ed6..0000000 --- a/src/com/android/camera/gallery/DrmImageList.java +++ /dev/null @@ -1,105 +0,0 @@ -/* - * Copyright (C) 2009 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.camera.gallery; - -import android.content.ContentResolver; -import android.database.Cursor; -import android.graphics.Bitmap; -import android.net.Uri; -import android.provider.DrmStore; - -/** - * Represents an ordered collection of Image objects from the DRM provider. - */ -public class DrmImageList extends ImageList implements IImageList { - - // TODO: get other field from database too ? - private static final String[] DRM_IMAGE_PROJECTION = new String[] { - DrmStore.Images._ID, - DrmStore.Images.DATA, - DrmStore.Images.MIME_TYPE, - }; - - private static final int INDEX_ID = 0; - private static final int INDEX_DATA_PATH = 1; - private static final int INDEX_MIME_TYPE = 2; - - public DrmImageList(ContentResolver resolver, Uri imageUri, int sort, - String bucketId) { - super(resolver, imageUri, sort, bucketId); - } - - @Override - protected String sortOrder() { - // We have no date information in DrmStore, so we just sort by _id. - return "_id ASC"; - } - - @Override - protected Cursor createCursor() { - return mContentResolver.query( - mBaseUri, DRM_IMAGE_PROJECTION, null, null, sortOrder()); - } - - private static class DrmImage extends Image { - - protected DrmImage(BaseImageList container, ContentResolver cr, - long id, int index, Uri uri, String dataPath, - long miniThumbMagic, String mimeType, long dateTaken, - String title, int rotation) { - super(container, cr, id, index, uri, dataPath, miniThumbMagic, - mimeType, dateTaken, title, rotation); - } - - @Override - public int getDegreesRotated() { - return 0; - } - - @Override - public boolean isDrm() { - return true; - } - - @Override - public boolean isReadonly() { - return true; - } - - @Override - public Bitmap miniThumbBitmap() { - return fullSizeBitmap(IImage.MINI_THUMB_TARGET_SIZE, - IImage.MINI_THUMB_MAX_NUM_PIXELS); - } - - @Override - public Bitmap thumbBitmap(boolean rotateAsNeeded) { - return fullSizeBitmap(IImage.THUMBNAIL_TARGET_SIZE, - IImage.THUMBNAIL_MAX_NUM_PIXELS); - } - } - - @Override - protected BaseImage loadImageFromCursor(Cursor cursor) { - long id = cursor.getLong(INDEX_ID); - String dataPath = cursor.getString(INDEX_DATA_PATH); - String mimeType = cursor.getString(INDEX_MIME_TYPE); - return new DrmImage(this, mContentResolver, id, cursor.getPosition(), - contentUri(id), dataPath, 0, mimeType, 0, "DrmImage-" + id, - 0); - } -} -- 2.11.0