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

Commit 469263a4 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android (Google) Code Review
Browse files

Merge "More CTS for APIs used by Mainline." into rvc-dev

parents 0a4ed3ec 9ed18340

api/test-current.txt

+7 −0
Original line number Diff line number Diff line
@@ -784,6 +784,8 @@ package android.content { 
  }



  public abstract class ContentResolver {

    method @NonNull public static android.net.Uri decodeFromFile(@NonNull java.io.File);

    method @NonNull public static java.io.File encodeToFile(@NonNull android.net.Uri);

    method public static String[] getSyncAdapterPackagesForAuthorityAsUser(String, int);

  }
@@ -2919,6 +2921,11 @@ package android.provider { 
    method @NonNull public android.provider.DeviceConfig.Properties.Builder setString(@NonNull String, @Nullable String);

  }



  public final class DocumentsContract {

    method public static boolean isManageMode(@NonNull android.net.Uri);

    method @NonNull public static android.net.Uri setManageMode(@NonNull android.net.Uri);

  }



  public final class MediaStore {

    method @NonNull @WorkerThread public static android.net.Uri scanFile(@NonNull android.content.ContentResolver, @NonNull java.io.File);

    method @WorkerThread public static void scanVolume(@NonNull android.content.ContentResolver, @NonNull String);

core/java/android/content/ContentResolver.java

+9 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import android.annotation.IntDef; 
import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.RequiresPermission;

import android.annotation.SuppressLint;

import android.annotation.SystemApi;

import android.annotation.TestApi;

import android.annotation.UserIdInt;
@@ -4014,6 +4015,10 @@ public abstract class ContentResolver implements ContentInterface { 
     * @hide

     */

    @SystemApi

    @TestApi

    // We can't accept an already-opened FD here, since these methods are

    // rewriting actual filesystem paths

    @SuppressLint("StreamFiles")

    public static @NonNull Uri decodeFromFile(@NonNull File file) {

        return translateDeprecatedDataPath(file.getAbsolutePath());

    }
@@ -4030,6 +4035,10 @@ public abstract class ContentResolver implements ContentInterface { 
     * @hide

     */

    @SystemApi

    @TestApi

    // We can't accept an already-opened FD here, since these methods are

    // rewriting actual filesystem paths

    @SuppressLint("StreamFiles")

    public static @NonNull File encodeToFile(@NonNull Uri uri) {

        return new File(translateDeprecatedDataPath(uri));

    }

core/java/android/provider/DocumentsContract.java

+3 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import static com.android.internal.util.Preconditions.checkCollectionNotEmpty; 
import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.SystemApi;

import android.annotation.TestApi;

import android.compat.annotation.UnsupportedAppUsage;

import android.content.ContentInterface;

import android.content.ContentProvider;
@@ -1303,6 +1304,7 @@ public final class DocumentsContract { 
     * {@hide}

     */

    @SystemApi

    @TestApi

    public static @NonNull Uri setManageMode(@NonNull Uri uri) {

        Preconditions.checkNotNull(uri, "uri can not be null");

        return uri.buildUpon().appendQueryParameter(PARAM_MANAGE, "true").build();
@@ -1314,6 +1316,7 @@ public final class DocumentsContract { 
     * {@hide}

     */

    @SystemApi

    @TestApi

    public static boolean isManageMode(@NonNull Uri uri) {

        Preconditions.checkNotNull(uri, "uri can not be null");

        return uri.getBooleanQueryParameter(PARAM_MANAGE, false);