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

Commit c1cf491d authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android (Google) Code Review
Browse files

Merge "More on issue #10130785: Restore silence and vibrate settings..." into klp-dev

parents b5f694f6 b3ac67a0
Loading
Loading
Loading
Loading
+4 −2
Original line number Diff line number Diff line
@@ -918,8 +918,10 @@ public abstract class ContentProvider implements ComponentCallbacks2 {
     *
     * @param url The Uri to remove any canonicalization from.
     *
     * @return Return the non-canonical representation of <var>url</var>, or return
     * the <var>url</var> as-is if there is nothing to do.  Never return null.
     * @return Return the non-canonical representation of <var>url</var>, return
     * the <var>url</var> as-is if there is nothing to do, or return null if
     * the data identified by the canonical representation can not be found in
     * the current environment.
     */
    public Uri uncanonicalize(Uri url) {
        return url;
+6 −4
Original line number Diff line number Diff line
@@ -548,14 +548,16 @@ public abstract class ContentResolver {
     * it to its local non-canonical form.  This can be useful in some cases where
     * you know that you will only be using the Uri in the current environment and
     * want to avoid any possible overhead when using it with the content
     * provider.
     * provider or want to verify that the referenced data exists at all in the
     * new environment.
     *
     * @param url The canonical {@link Uri} that is to be convered back to its
     * non-canonical form.
     *
     * @return Returns the non-canonical representation of <var>url</var>.  This
     * function never returns null; if there is no conversion to be done, it returns
     * the same Uri that was provided.
     * @return Returns the non-canonical representation of <var>url</var>.  This will
     * return null if data identified by the canonical Uri can not be found in
     * the current environment; callers must always check for null and deal with
     * that by appropriately falling back to an alternative.
     *
     * @see #canonicalize
     */