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

Merge "Adjustments after moving MediaStore inside APEX."

Browse Source
This commit is contained in:
Jeff Sharkey
2019-12-20 21:02:55 +00:00
committed by Android (Google) Code Review
parent a50f8e9a99 1fec28066f
commit bb09ee38bc
2 changed files with 1 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
api/removed.txt
View File

@@ -435,15 +435,6 @@ package android.provider {
field @Deprecated public static final String TIMESTAMP = "timestamp";
}
public final class MediaStore {
method @Deprecated @NonNull public static java.util.Set<java.lang.String> getAllVolumeNames(@NonNull android.content.Context);
method @Deprecated public static boolean getIncludePending(@NonNull android.net.Uri);
method @Deprecated @NonNull public static android.net.Uri setIncludeTrashed(@NonNull android.net.Uri);
method @Deprecated public static void trash(@NonNull android.content.Context, @NonNull android.net.Uri);
method @Deprecated public static void trash(@NonNull android.content.Context, @NonNull android.net.Uri, long);
method @Deprecated public static void untrash(@NonNull android.content.Context, @NonNull android.net.Uri);
}
public static interface MediaStore.Audio.AudioColumns extends android.provider.MediaStore.MediaColumns {
field public static final String ALBUM = "album";
field public static final String ARTIST = "artist";

4
core/java/android/annotation/RequiresPermission.java
View File

@@ -15,8 +15,6 @@
*/
package android.annotation;
import android.content.Intent;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
@@ -57,7 +55,7 @@ import static java.lang.annotation.RetentionPolicy.SOURCE;
* <p>
* When specified on a parameter, the annotation indicates that the method requires
* a permission which depends on the value of the parameter. For example, consider
* {@link android.app.Activity#startActivity(Intent)}:
* {@link android.app.Activity#startActivity(android.content.Intent)}:
* <pre>{@code
* public void startActivity(@RequiresPermission Intent intent) { ... }
* }</pre>