Remove unused code.

Change-Id: I167596ab023671651df298ddb2b80b7c782f4223

9 files changed, 1 insertions, 132 deletions

diff --git a/src/com/android/gallery3d/data/ChangeNotifier.java b/src/com/android/gallery3d/data/ChangeNotifier.java
index e1e601dd6..4f9f56b07 100644
--- a/src/com/android/gallery3d/data/ChangeNotifier.java
+++ b/src/com/android/gallery3d/data/ChangeNotifier.java
@@ -38,14 +38,11 @@ public class ChangeNotifier {
         return mContentDirty.compareAndSet(true, false);
     }
 
+    // For debugging only.
     public void fakeChange() {
         onChange(false);
     }
 
-    public void clearDirty() {
-        mContentDirty.set(false);
-    }
-
     protected void onChange(boolean selfChange) {
         if (mContentDirty.compareAndSet(false, true)) {
             mMediaSet.notifyContentChanged();
diff --git a/src/com/android/gallery3d/data/DataManager.java b/src/com/android/gallery3d/data/DataManager.java
index 51d4af9eb..e08fdedb6 100644
--- a/src/com/android/gallery3d/data/DataManager.java
+++ b/src/com/android/gallery3d/data/DataManager.java
@@ -145,10 +145,6 @@ public class DataManager {
         return path.getObject();
     }
 
-    public MediaSet peekMediaSet(Path path) {
-        return (MediaSet) path.getObject();
-    }
-
     public MediaObject getMediaObject(Path path) {
         MediaObject obj = path.getObject();
         if (obj != null) return obj;
@@ -245,14 +241,6 @@ public class DataManager {
         return getMediaObject(path).getMediaType();
     }
 
-    public MediaDetails getDetails(Path path) {
-        return getMediaObject(path).getDetails();
-    }
-
-    public void cache(Path path, int flag) {
-        getMediaObject(path).cache(flag);
-    }
-
     public Path findPathByUri(Uri uri) {
         if (uri == null) return null;
         for (MediaSource source : mSourceMap.values()) {
diff --git a/src/com/android/gallery3d/data/DecodeUtils.java b/src/com/android/gallery3d/data/DecodeUtils.java
index b205576cd..969fd9854 100644
--- a/src/com/android/gallery3d/data/DecodeUtils.java
+++ b/src/com/android/gallery3d/data/DecodeUtils.java
@@ -48,14 +48,6 @@ public class DecodeUtils {
         }
     }
 
-    public static Bitmap requestDecode(JobContext jc, final String filePath,
-            Options options) {
-        if (options == null) options = new Options();
-        jc.setCancelListener(new DecodeCanceller(options));
-        return ensureGLCompatibleBitmap(
-                BitmapFactory.decodeFile(filePath, options));
-    }
-
     public static Bitmap requestDecode(JobContext jc, FileDescriptor fd, Options options) {
         if (options == null) options = new Options();
         jc.setCancelListener(new DecodeCanceller(options));
@@ -136,14 +128,6 @@ public class DecodeUtils {
                 BitmapFactory.decodeByteArray(data, 0, data.length, options));
     }
 
-    public static Bitmap requestDecode(JobContext jc,
-            FileDescriptor fileDescriptor, Rect paddings, Options options) {
-        if (options == null) options = new Options();
-        jc.setCancelListener(new DecodeCanceller(options));
-        return ensureGLCompatibleBitmap(BitmapFactory.decodeFileDescriptor
-                (fileDescriptor, paddings, options));
-    }
-
     // TODO: This function should not be called directly from
     // DecodeUtils.requestDecode(...), since we don't have the knowledge
     // if the bitmap will be uploaded to GL.
@@ -203,20 +187,4 @@ public class DecodeUtils {
             return null;
         }
     }
-
-    public static BitmapRegionDecoder requestCreateBitmapRegionDecoder(
-            JobContext jc, Uri uri, ContentResolver resolver,
-            boolean shareable) {
-        ParcelFileDescriptor pfd = null;
-        try {
-            pfd = resolver.openFileDescriptor(uri, "r");
-            return BitmapRegionDecoder.newInstance(
-                    pfd.getFileDescriptor(), shareable);
-        } catch (Throwable t) {
-            Log.w(TAG, t);
-            return null;
-        } finally {
-            Utils.closeSilently(pfd);
-        }
-    }
 }
diff --git a/src/com/android/gallery3d/data/DownloadCache.java b/src/com/android/gallery3d/data/DownloadCache.java
index 30ba668c3..9646a6383 100644
--- a/src/com/android/gallery3d/data/DownloadCache.java
+++ b/src/com/android/gallery3d/data/DownloadCache.java
@@ -78,7 +78,6 @@ public class DownloadCache {
 
     private long mTotalBytes = 0;
     private boolean mInitialized = false;
-    private WeakHashMap<Object, Entry> mAssociateMap = new WeakHashMap<Object, Entry>();
 
     public DownloadCache(GalleryApp application, File root, long capacity) {
         mRoot = Utils.checkNotNull(root);
@@ -113,31 +112,6 @@ public class DownloadCache {
         return null;
     }
 
-    public Entry lookup(URL url) {
-        if (!mInitialized) initialize();
-        String stringUrl = url.toString();
-
-        // First find in the entry-pool
-        synchronized (mEntryMap) {
-            Entry entry = mEntryMap.get(stringUrl);
-            if (entry != null) {
-                updateLastAccess(entry.mId);
-                return entry;
-            }
-        }
-
-        // Then, find it in database
-        TaskProxy proxy = new TaskProxy();
-        synchronized (mTaskMap) {
-            Entry entry = findEntryInDatabase(stringUrl);
-            if (entry != null) {
-                updateLastAccess(entry.mId);
-                return entry;
-            }
-        }
-        return null;
-    }
-
     public Entry download(JobContext jc, URL url) {
         if (!mInitialized) initialize();
 
@@ -282,10 +256,6 @@ public class DownloadCache {
             mId = id;
             this.cacheFile = Utils.checkNotNull(cacheFile);
         }
-
-        public void associateWith(Object object) {
-            mAssociateMap.put(Utils.checkNotNull(object), this);
-        }
     }
 
     private class DownloadTask implements Job<File>, FutureListener<File> {
diff --git a/src/com/android/gallery3d/data/DownloadUtils.java b/src/com/android/gallery3d/data/DownloadUtils.java
index 9632db984..e055c442f 100644
--- a/src/com/android/gallery3d/data/DownloadUtils.java
+++ b/src/com/android/gallery3d/data/DownloadUtils.java
@@ -44,22 +44,6 @@ public class DownloadUtils {
         }
     }
 
-    public static byte[] requestDownload(JobContext jc, URL url) {
-        ByteArrayOutputStream baos = null;
-        try {
-            baos = new ByteArrayOutputStream();
-            if (!download(jc, url, baos)) {
-                return null;
-            }
-            return baos.toByteArray();
-        } catch (Throwable t) {
-            Log.w(TAG, t);
-            return null;
-        } finally {
-            Utils.closeSilently(baos);
-        }
-    }
-
     public static void dump(JobContext jc, InputStream is, OutputStream os)
             throws IOException {
         byte buffer[] = new byte[4096];
diff --git a/src/com/android/gallery3d/data/Face.java b/src/com/android/gallery3d/data/Face.java
index c5fd131ae..29af27f15 100644
--- a/src/com/android/gallery3d/data/Face.java
+++ b/src/com/android/gallery3d/data/Face.java
@@ -45,22 +45,10 @@ public class Face implements Comparable<Face> {
         return mPosition;
     }
 
-    public int getWidth() {
-        return mPosition.right - mPosition.left;
-    }
-
-    public int getHeight() {
-        return mPosition.bottom - mPosition.top;
-    }
-
     public String getName() {
         return mName;
     }
 
-    public String getPersonId() {
-        return mPersonId;
-    }
-
     @Override
     public boolean equals(Object obj) {
         if (obj instanceof Face) {
diff --git a/src/com/android/gallery3d/data/LocalVideo.java b/src/com/android/gallery3d/data/LocalVideo.java
index ca379c35a..d68072bec 100644
--- a/src/com/android/gallery3d/data/LocalVideo.java
+++ b/src/com/android/gallery3d/data/LocalVideo.java
@@ -73,7 +73,6 @@ public class LocalVideo extends LocalMediaItem {
     };
 
     private final GalleryApp mApplication;
-    private static Bitmap sOverlay;
 
     public int durationInSec;
 
diff --git a/src/com/android/gallery3d/data/MediaDetails.java b/src/com/android/gallery3d/data/MediaDetails.java
index 1b56ac42e..8f0ca7d7b 100644
--- a/src/com/android/gallery3d/data/MediaDetails.java
+++ b/src/com/android/gallery3d/data/MediaDetails.java
@@ -73,22 +73,6 @@ public class MediaDetails implements Iterable<Entry<Integer, Object>> {
         public boolean isFlashFired() {
             return (mState & FLASH_FIRED_MASK) != 0;
         }
-
-        public int getFlashReturn() {
-            return (mState & FLASH_RETURN_MASK) >> 1;
-        }
-
-        public int getFlashMode() {
-            return (mState & FLASH_MODE_MASK) >> 3;
-        }
-
-        public boolean isFlashPresent() {
-            return (mState & FLASH_FUNCTION_MASK) != 0;
-        }
-
-        public boolean isRedEyeModePresent() {
-            return (mState & FLASH_RED_EYE_MASK) != 0;
-        }
     }
 
     public void addDetail(int index, Object value) {
diff --git a/src/com/android/gallery3d/data/Path.java b/src/com/android/gallery3d/data/Path.java
index 3de1c7c76..a09df10ad 100644
--- a/src/com/android/gallery3d/data/Path.java
+++ b/src/com/android/gallery3d/data/Path.java
@@ -190,15 +190,6 @@ public class Path {
         return mSegment;
     }
 
-    public String getSuffix(int level) {
-        // We don't need lock because mSegment and mParent are final.
-        Path p = this;
-        while (level-- != 0) {
-            p = p.mParent;
-        }
-        return p.mSegment;
-    }
-
     // Below are for testing/debugging only
     static void clearAll() {
         synchronized (Path.class) {