diff options
author | Mark Brophy <mbrophy@google.com> | 2012-07-04 09:36:14 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2012-07-04 09:36:14 -0700 |
commit | 2368d0684edf60c665854ef2453ba53ed7ee7996 (patch) | |
tree | 035788044b1ac5bd42398be53ad8d2f3b0a14b2d | |
parent | 4e5c89e8676bc83f3439da94aa6c2b559b3d0479 (diff) | |
parent | 39bf4a89856ac726e3b69a9729b98ec1531f019c (diff) | |
download | ApplicationsProvider-2368d0684edf60c665854ef2453ba53ed7ee7996.tar.gz |
am 39bf4a89: am 471522da: Remove result ordering for global search.
* commit '39bf4a89856ac726e3b69a9729b98ec1531f019c':
Remove result ordering for global search.
-rw-r--r-- | src/com/android/providers/applications/ApplicationsProvider.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/providers/applications/ApplicationsProvider.java b/src/com/android/providers/applications/ApplicationsProvider.java index c292efd..a7fa1b9 100644 --- a/src/com/android/providers/applications/ApplicationsProvider.java +++ b/src/com/android/providers/applications/ApplicationsProvider.java @@ -396,6 +396,7 @@ public class ApplicationsProvider extends ContentProvider { SQLiteQueryBuilder qb = new SQLiteQueryBuilder(); qb.setTables(APPLICATIONS_LOOKUP_JOIN); qb.setProjectionMap(columnMap); + String orderBy = null; if (!zeroQuery) { qb.appendWhere(buildTokenFilter(query)); } else { @@ -403,9 +404,11 @@ public class ApplicationsProvider extends ContentProvider { qb.appendWhere(LAST_RESUME_TIME + " > 0"); } } + if (!hasGlobalSearchPermission()) { + orderBy = getOrderBy(zeroQuery); + } // don't return duplicates when there are two matching tokens for an app String groupBy = APPLICATIONS_TABLE + "." + _ID; - String orderBy = getOrderBy(zeroQuery); Cursor cursor = qb.query(mDb, projectionIn, null, null, groupBy, null, orderBy); if (DBG) Log.d(TAG, "Returning " + cursor.getCount() + " results for " + query); return cursor; |