summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHall Liu <hallliu@google.com>2021-03-04 02:46:32 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-03-04 02:46:32 +0000
commitd80b097d82efea9b6c82723df1d93f2e3a41952a (patch)
tree8b6a8973f3afd28b508a8adfa1e693f8809fefde
parentb7967ff9a855cfac87d53c6a51804655f9d57cfa (diff)
parentc5c9242194110d2266232787149240111fa51753 (diff)
downloadbase-d80b097d82efea9b6c82723df1d93f2e3a41952a.tar.gz
Merge "Allow empty tokens in strict grammar" into rvc-dev am: c5c9242194
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13554969 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I481f17b14cac37be689af462843cc1576bbbebae
-rw-r--r--core/java/android/provider/CallLog.java11
1 files changed, 9 insertions, 2 deletions
diff --git a/core/java/android/provider/CallLog.java b/core/java/android/provider/CallLog.java
index a0e92b398c4e..276f16216b4d 100644
--- a/core/java/android/provider/CallLog.java
+++ b/core/java/android/provider/CallLog.java
@@ -99,6 +99,13 @@ public class CallLog {
public static final String LIMIT_PARAM_KEY = "limit";
/**
+ * Form of {@link #CONTENT_URI} which limits the query results to a single result.
+ */
+ private static final Uri CONTENT_URI_LIMIT_1 = CONTENT_URI.buildUpon()
+ .appendQueryParameter(LIMIT_PARAM_KEY, "1")
+ .build();
+
+ /**
* Query parameter used to specify the starting record to return.
* <p>
* TYPE: integer
@@ -932,11 +939,11 @@ public class CallLog {
Cursor c = null;
try {
c = resolver.query(
- CONTENT_URI,
+ CONTENT_URI_LIMIT_1,
new String[] {NUMBER},
TYPE + " = " + OUTGOING_TYPE,
null,
- DEFAULT_SORT_ORDER + " LIMIT 1");
+ DEFAULT_SORT_ORDER);
if (c == null || !c.moveToFirst()) {
return "";
}