diff options
author | Mark Brophy <mbrophy@google.com> | 2012-07-04 14:34:16 +0100 |
---|---|---|
committer | Mark Brophy <mbrophy@google.com> | 2012-07-04 16:56:16 +0100 |
commit | 471522da26d6f9d7afcacab5fa7012a90dac566e (patch) | |
tree | 2ec8a0d8766596c7a4488a0cb32cd2d678daf71a | |
parent | 929d8bb85a57135602372a7126a8cb0420025d70 (diff) | |
download | ApplicationsProvider-471522da26d6f9d7afcacab5fa7012a90dac566e.tar.gz |
Remove result ordering for global search.android-cts-4.1_r4android-cts-4.1_r2android-cts-4.1_r1jb-dev
Change-Id: I7efab03f5a4ecb529be53bf12e2f8764f0fe8ef9
-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; |