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

Commit 2b7ccb4d authored by Mariah Papy's avatar Mariah Papy Committed by Automerger Merge Worker
Browse files

Merge "Small typo fix" into main am: e0343f2c am: 31676f42 

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



Change-Id: I256850a74d0abc34758ae0f2c80db9f0e9037bf0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0cba7fe6 31676f42

core/java/android/content/ContentProvider.java

+1 −1
Original line number Diff line number Diff line
@@ -185,7 +185,7 @@ public abstract class ContentProvider implements ContentInterface, ComponentCall 
     *

     * @param context A Context object which should be some mock instance (like the

     * instance of {@link android.test.mock.MockContext}).

     * @param readPermission The read permision you want this instance should have in the

     * @param readPermission The read permission you want this instance should have in the

     * test, which is available via {@link #getReadPermission()}.

     * @param writePermission The write permission you want this instance should have

     * in the test, which is available via {@link #getWritePermission()}.

core/java/android/content/ContentResolver.java

+1 −1
Original line number Diff line number Diff line
@@ -387,7 +387,7 @@ public abstract class ContentResolver implements ContentInterface { 
     * {@link Bundle} under {@link #EXTRA_HONORED_ARGS}.

     * <li>When querying a provider, where no QUERY_ARG_SQL* otherwise exists in

     * the arguments {@link Bundle}, the Content framework will attempt to

     * synthesize an QUERY_ARG_SQL* argument using the corresponding

     * synthesize a QUERY_ARG_SQL* argument using the corresponding

     * QUERY_ARG_SORT* values.

     */

    public static final String QUERY_ARG_SORT_COLUMNS = "android:query-arg-sort-columns";