commit f208d84542605c76a060e3a2e76166bbd940b3bb
author Steve McKay <smckay@google.com> Mon Feb 27 12:57:58 2017 -0800
committer Steve McKay <smckay@google.com> Mon Feb 27 13:12:31 2017 -0800
tree c16a8ab38e67384f028dd739c5caa430dce6d1b2
parent 50b9baedc04a226b7a2e21f81f9a87533e3f7d02

Make Sorting/paging honor ENABLE_OMC_FEATURES flag

BUG: 30927484
Change-Id: Ia15b566da9e8fa7de6e5b70bc39f542cf4f5ff11

src/com/android/documentsui/DirectoryLoader.java

diff --git a/src/com/android/documentsui/DirectoryLoader.java b/src/com/android/documentsui/DirectoryLoader.java
index 12abd21..5c93f76 100644
--- a/src/com/android/documentsui/DirectoryLoader.java
+++ b/src/com/android/documentsui/DirectoryLoader.java
@@ -99,22 +99,23 @@
                 ArchivesProvider.acquireArchive(client, mUri);
             }
             result.client = client;
-            Bundle queryArgs = new Bundle();
-            mModel.addQuerySortArgs(queryArgs);
 
-            // TODO: At some point we don't want forced flags to override real paging...
-            // and that point is when we have real paging.
-            DebugFlags.addForcedPagingArgs(queryArgs);
+            if (Shared.ENABLE_OMC_API_FEATURES) {
+                Bundle queryArgs = new Bundle();
+                mModel.addQuerySortArgs(queryArgs);
 
-            cursor = client.query(mUri, null, queryArgs, mSignal);
-            if (cursor == null) {
-                throw new RemoteException("Provider returned null");
+                // TODO: At some point we don't want forced flags to override real paging...
+                // and that point is when we have real paging.
+                DebugFlags.addForcedPagingArgs(queryArgs);
+
+                cursor = client.query(mUri, null, queryArgs, mSignal);
+            } else {
+                cursor = client.query(
+                        mUri, null, null, null, mModel.getDocumentSortQuery(), mSignal);
             }
 
-            Bundle extras = cursor.getExtras();
-            if (extras.containsKey(ContentResolver.QUERY_RESULT_SIZE)) {
-                Log.i(TAG, "[PAGING INDICATED] Cursor extras specify recordset size of: "
-                        + extras.getInt(ContentResolver.QUERY_RESULT_SIZE));
+            if (cursor == null) {
+                throw new RemoteException("Provider returned null");
             }
 
             cursor.registerContentObserver(mObserver);