commit 25da9375fdf2e92c3f50c878da9c781a368bf255
author Mike Lockwood <lockwood@google.com> Tue Sep 11 10:57:41 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue Sep 11 10:57:41 2012 -0700
tree 0cc37d1fb5b6771a81d3b0d7163ecd8db737dd92
parent 8b9e467dfb2738679ac40ef4338be7b17610df81
parent 58e6831ccb54b33a914115e88ebb67e720615fb8

Merge "MtpDatabase: Fix typo affecting parent and format queries" into jb-mr1-dev

media/java/android/mtp/MtpDatabase.java

diff --git a/media/java/android/mtp/MtpDatabase.java b/media/java/android/mtp/MtpDatabase.java
index 7532d79..79250fb 100755
--- a/media/java/android/mtp/MtpDatabase.java
+++ b/media/java/android/mtp/MtpDatabase.java
@@ -103,8 +103,8 @@
     private static final String PATH_WHERE = Files.FileColumns.DATA + "=?";
 
     private static final String STORAGE_WHERE = Files.FileColumns.STORAGE_ID + "=?";
-    private static final String FORMAT_WHERE = Files.FileColumns.PARENT + "=?";
-    private static final String PARENT_WHERE = Files.FileColumns.FORMAT + "=?";
+    private static final String FORMAT_WHERE = Files.FileColumns.FORMAT + "=?";
+    private static final String PARENT_WHERE = Files.FileColumns.PARENT + "=?";
     private static final String STORAGE_FORMAT_WHERE = STORAGE_WHERE + " AND "
                                             + Files.FileColumns.FORMAT + "=?";
     private static final String STORAGE_PARENT_WHERE = STORAGE_WHERE + " AND "