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

Merge "Updates based on API council feedback." into rvc-dev am: 16c9fb8c0f am: 02f173032d am: 1a1d3b1334

Browse Source 
Change-Id: I0eaaf0f9e307d761b76d422dc480538157670280
This commit is contained in:
Automerger Merge Worker
2020-03-08 21:43:00 +00:00
parent 7ed851d886 1a1d3b1334
commit a1b1440454
5 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Android.bp
View File

@@ -700,6 +700,7 @@ filegroup {
"core/java/android/annotation/SystemApi.java",
"core/java/android/annotation/SystemService.java",
"core/java/android/annotation/TestApi.java",
"core/java/android/annotation/WorkerThread.java",
"core/java/com/android/internal/annotations/GuardedBy.java",
"core/java/com/android/internal/annotations/VisibleForTesting.java",
"core/java/com/android/internal/annotations/Immutable.java",

1
api/current.txt
View File

@@ -36592,6 +36592,7 @@ package android.os {
method public static android.os.ParcelFileDescriptor open(java.io.File, int) throws java.io.FileNotFoundException;
method public static android.os.ParcelFileDescriptor open(java.io.File, int, android.os.Handler, android.os.ParcelFileDescriptor.OnCloseListener) throws java.io.IOException;
method public static int parseMode(String);
method @NonNull public static android.os.ParcelFileDescriptor wrap(@NonNull android.os.ParcelFileDescriptor, @NonNull android.os.Handler, @NonNull android.os.ParcelFileDescriptor.OnCloseListener) throws java.io.IOException;
method public void writeToParcel(android.os.Parcel, int);
field @NonNull public static final android.os.Parcelable.Creator<android.os.ParcelFileDescriptor> CREATOR;
field public static final int MODE_APPEND = 33554432; // 0x2000000

10
api/system-current.txt
View File

@@ -8467,10 +8467,6 @@ package android.os {
method public boolean hasSingleFileDescriptor();
}
public class ParcelFileDescriptor implements java.io.Closeable android.os.Parcelable {
method @NonNull public static android.os.ParcelFileDescriptor wrap(@NonNull android.os.ParcelFileDescriptor, @NonNull android.os.Handler, @NonNull android.os.ParcelFileDescriptor.OnCloseListener) throws java.io.IOException;
}
public final class PowerManager {
method @RequiresPermission(allOf={android.Manifest.permission.READ_DREAM_STATE, android.Manifest.permission.WRITE_DREAM_STATE}) public void dream(long);
method @RequiresPermission(android.Manifest.permission.DEVICE_POWER) public boolean forceSuspend();
@@ -9204,9 +9200,9 @@ package android.provider {
public final class MediaStore {
method @NonNull public static android.net.Uri rewriteToLegacy(@NonNull android.net.Uri);
method @NonNull public static android.net.Uri scanFile(@NonNull android.content.ContentResolver, @NonNull java.io.File);
method public static void scanVolume(@NonNull android.content.ContentResolver, @NonNull String);
method public static void waitForIdle(@NonNull android.content.ContentResolver);
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);
field public static final String AUTHORITY_LEGACY = "media_legacy";
field @NonNull public static final android.net.Uri AUTHORITY_LEGACY_URI;
}

6
api/test-current.txt
View File

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

2
core/java/android/os/ParcelFileDescriptor.java
View File

@@ -282,9 +282,7 @@ public class ParcelFileDescriptor implements Parcelable, Closeable {
* @param listener to be invoked when the returned descriptor has been
* closed.
* @return a new ParcelFileDescriptor pointing to the given file.
* @hide
*/
@SystemApi
// We can't accept a generic Executor here, since we need to use
// MessageQueue.addOnFileDescriptorEventListener()
@SuppressLint("ExecutorRegistration")