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

Commit 1fec2806 authored by Jeff Sharkey's avatar Jeff Sharkey
Browse files

Adjustments after moving MediaStore inside APEX. 

The "core_platform" SDK technically includes non-stable APIs, so we
need to shift to "core_current" instead.

While we're here, tidy up some older @removed APIs that never shipped
and replace HexEncoding with a local implementation.

Since MediaProvider itself is free to use @hide APIs from its own
framework code in MediaStore.java, we can include all sources
from "framework-mediaprovider-sources" directly.

Also since the "framework-annotations" filegroup in Android.bp is
a very limited subset of leaf source code, it can't directly
reference Intent, so adjust the javadoc so we can drop the "import."

Bug: 144247087
Test: atest --test-mapping packages/providers/MediaProvider
Change-Id: I198d84a755b5e270a19b41328f6a6e152112c40a
parent 1e89d231

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>