summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Anton Hansson <hansson@google.com> 2020-10-15 22:52:47 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2020-10-15 22:52:47 +0000
commitaea67fa8c9ea72a974713946900f2058b2297a69 (patch)
tree4c3c15b5a5dec078345f0c5006906bc5f5ec9347
parent4747fc95441e6fad85fad27d84738773983342f5 (diff)
parent4053ff88b579a5871953c432928fa2d4ef0ed8db (diff)
Merge "Update test-current.txt with removed MP APIs" am: f5e95d6a5f am: 4053ff88b5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1460267 Change-Id: I6616a7c98f6339a3fde3ea20e7aa7a8154f540b0
-rw-r--r--api/test-current.txt6
1 files changed, 0 insertions, 6 deletions
diff --git a/api/test-current.txt b/api/test-current.txt
index 2b76dd9be202..912f33c763cd 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -3173,12 +3173,6 @@ package android.provider {
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);
- method @WorkerThread public static void waitForIdle(@NonNull android.content.ContentResolver);
- }
-
public final class Settings {
field public static final String ACTION_ENTERPRISE_PRIVACY_SETTINGS = "android.settings.ENTERPRISE_PRIVACY_SETTINGS";
field public static final String ACTION_MANAGE_APP_OVERLAY_PERMISSION = "android.settings.MANAGE_APP_OVERLAY_PERMISSION";