Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d80b097d authored by Hall Liu's avatar Hall Liu Committed by Automerger Merge Worker
Browse files

Merge "Allow empty tokens in strict grammar" into rvc-dev am: c5c92421 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13554969

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I481f17b14cac37be689af462843cc1576bbbebae
parents b7967ff9 c5c92421

core/java/android/provider/CallLog.java

+9 −2
Original line number Diff line number Diff line
@@ -98,6 +98,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>
@@ -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 "";

                }