Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Merge "More CTS for APIs used by Mainline." into rvc-dev am: 469263a457 am: cdac1f3854" into rvc-d1-dev-plus-aosp am: e2a6e48ee5

Browse Source 
Change-Id: I96f1f67802f12472f71f7b2be8ad17361e8f0b6e
This commit is contained in:
Automerger Merge Worker
2020-03-09 22:57:21 +00:00
parent c0a71858b6 e2a6e48ee5
commit dbcb04010b
3 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
api/test-current.txt
View File

@@ -784,6 +784,8 @@ package android.content {
} }
public abstract class ContentResolver { 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); 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); 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 { public final class MediaStore {
method @NonNull @WorkerThread public static android.net.Uri scanFile(@NonNull android.content.ContentResolver, @NonNull java.io.File); 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); method @WorkerThread public static void scanVolume(@NonNull android.content.ContentResolver, @NonNull String);

9
core/java/android/content/ContentResolver.java
View File

@@ -23,6 +23,7 @@ import android.annotation.IntDef;
import android.annotation.NonNull; import android.annotation.NonNull;
import android.annotation.Nullable; import android.annotation.Nullable;
import android.annotation.RequiresPermission; import android.annotation.RequiresPermission;
import android.annotation.SuppressLint;
import android.annotation.SystemApi; import android.annotation.SystemApi;
import android.annotation.TestApi; import android.annotation.TestApi;
import android.annotation.UserIdInt; import android.annotation.UserIdInt;
@@ -4014,6 +4015,10 @@ public abstract class ContentResolver implements ContentInterface {
* @hide * @hide
*/ */
@SystemApi @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) { public static @NonNull Uri decodeFromFile(@NonNull File file) {
return translateDeprecatedDataPath(file.getAbsolutePath()); return translateDeprecatedDataPath(file.getAbsolutePath());
} }
@@ -4030,6 +4035,10 @@ public abstract class ContentResolver implements ContentInterface {
* @hide * @hide
*/ */
@SystemApi @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) { public static @NonNull File encodeToFile(@NonNull Uri uri) {
return new File(translateDeprecatedDataPath(uri)); return new File(translateDeprecatedDataPath(uri));
} }

3
core/java/android/provider/DocumentsContract.java
View File

@@ -22,6 +22,7 @@ import static com.android.internal.util.Preconditions.checkCollectionNotEmpty;
import android.annotation.NonNull; import android.annotation.NonNull;
import android.annotation.Nullable; import android.annotation.Nullable;
import android.annotation.SystemApi; import android.annotation.SystemApi;
import android.annotation.TestApi;
import android.compat.annotation.UnsupportedAppUsage; import android.compat.annotation.UnsupportedAppUsage;
import android.content.ContentInterface; import android.content.ContentInterface;
import android.content.ContentProvider; import android.content.ContentProvider;
@@ -1303,6 +1304,7 @@ public final class DocumentsContract {
* {@hide} * {@hide}
*/ */
@SystemApi @SystemApi
@TestApi
public static @NonNull Uri setManageMode(@NonNull Uri uri) { public static @NonNull Uri setManageMode(@NonNull Uri uri) {
Preconditions.checkNotNull(uri, "uri can not be null"); Preconditions.checkNotNull(uri, "uri can not be null");
return uri.buildUpon().appendQueryParameter(PARAM_MANAGE, "true").build(); return uri.buildUpon().appendQueryParameter(PARAM_MANAGE, "true").build();
@@ -1314,6 +1316,7 @@ public final class DocumentsContract {
* {@hide} * {@hide}
*/ */
@SystemApi @SystemApi
@TestApi
public static boolean isManageMode(@NonNull Uri uri) { public static boolean isManageMode(@NonNull Uri uri) {
Preconditions.checkNotNull(uri, "uri can not be null"); Preconditions.checkNotNull(uri, "uri can not be null");
return uri.getBooleanQueryParameter(PARAM_MANAGE, false); return uri.getBooleanQueryParameter(PARAM_MANAGE, false);