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

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

Merge "Adjustments after moving MediaStore inside APEX."

parents a50f8e9a 1fec2806

api/removed.txt

+0 −9
Original line number Diff line number Diff line
@@ -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";

core/java/android/annotation/RequiresPermission.java

+1 −3
Original line number Diff line number Diff line
@@ -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>