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

Commit a2b33caf authored by Anton Hansson's avatar Anton Hansson
Browse files

Hide mistakenly exposed public typedef annotations 

Typedef annotations are not meant to be in the SDK, so hide them with
@removed, which keeps the record that they were exposed previously.

Bug: 309971481
Test: m checkapi
Change-Id: I8471342b85e2d3a01c0e126317c194d94c9dd72a
parent faf2ba91

core/api/current.txt

+6 −12
Original line number Diff line number Diff line
@@ -22802,11 +22802,11 @@ package android.media { 
    method public void clearOnSessionLostStateListener();

    method public void close();

    method public void closeSession(@NonNull byte[]);

    method @android.media.MediaDrm.HdcpLevel public int getConnectedHdcpLevel();

    method public int getConnectedHdcpLevel();

    method public android.media.MediaDrm.CryptoSession getCryptoSession(@NonNull byte[], @NonNull String, @NonNull String);

    method @NonNull public android.media.MediaDrm.KeyRequest getKeyRequest(@NonNull byte[], @Nullable byte[], @Nullable String, int, @Nullable java.util.HashMap<java.lang.String,java.lang.String>) throws android.media.NotProvisionedException;

    method @NonNull public java.util.List<android.media.MediaDrm.LogMessage> getLogMessages();

    method @android.media.MediaDrm.HdcpLevel public int getMaxHdcpLevel();

    method public int getMaxHdcpLevel();

    method public static int getMaxSecurityLevel();

    method public int getMaxSessionCount();

    method public android.os.PersistableBundle getMetrics();
@@ -22820,13 +22820,13 @@ package android.media { 
    method @Deprecated @NonNull public byte[] getSecureStop(@NonNull byte[]);

    method @Deprecated @NonNull public java.util.List<byte[]> getSecureStopIds();

    method @Deprecated @NonNull public java.util.List<byte[]> getSecureStops();

    method @android.media.MediaDrm.SecurityLevel public int getSecurityLevel(@NonNull byte[]);

    method public int getSecurityLevel(@NonNull byte[]);

    method @NonNull public static java.util.List<java.util.UUID> getSupportedCryptoSchemes();

    method public static boolean isCryptoSchemeSupported(@NonNull java.util.UUID);

    method public static boolean isCryptoSchemeSupported(@NonNull java.util.UUID, @NonNull String);

    method public static boolean isCryptoSchemeSupported(@NonNull java.util.UUID, @NonNull String, @android.media.MediaDrm.SecurityLevel int);

    method public static boolean isCryptoSchemeSupported(@NonNull java.util.UUID, @NonNull String, int);

    method @NonNull public byte[] openSession() throws android.media.NotProvisionedException, android.media.ResourceBusyException;

    method @NonNull public byte[] openSession(@android.media.MediaDrm.SecurityLevel int) throws android.media.NotProvisionedException, android.media.ResourceBusyException;

    method @NonNull public byte[] openSession(int) throws android.media.NotProvisionedException, android.media.ResourceBusyException;

    method @Nullable public byte[] provideKeyResponse(@NonNull byte[], @NonNull byte[]) throws android.media.DeniedByServerException, android.media.NotProvisionedException;

    method public void provideProvisionResponse(@NonNull byte[]) throws android.media.DeniedByServerException;

    method @NonNull public java.util.HashMap<java.lang.String,java.lang.String> queryKeyStatus(@NonNull byte[]);
@@ -22838,7 +22838,7 @@ package android.media { 
    method public void removeOfflineLicense(@NonNull byte[]);

    method @Deprecated public void removeSecureStop(@NonNull byte[]);

    method public boolean requiresSecureDecoder(@NonNull String);

    method public boolean requiresSecureDecoder(@NonNull String, @android.media.MediaDrm.SecurityLevel int);

    method public boolean requiresSecureDecoder(@NonNull String, int);

    method public void restoreKeys(@NonNull byte[], @NonNull byte[]);

    method public void setOnEventListener(@Nullable android.media.MediaDrm.OnEventListener);

    method public void setOnEventListener(@Nullable android.media.MediaDrm.OnEventListener, @Nullable android.os.Handler);
@@ -22927,9 +22927,6 @@ package android.media { 
    field public static final int ERROR_ZERO_SUBSAMPLES = 33; // 0x21

  }













  @Deprecated @IntDef({android.media.MediaDrm.HDCP_LEVEL_UNKNOWN, android.media.MediaDrm.HDCP_NONE, android.media.MediaDrm.HDCP_V1, android.media.MediaDrm.HDCP_V2, android.media.MediaDrm.HDCP_V2_1, android.media.MediaDrm.HDCP_V2_2, android.media.MediaDrm.HDCP_V2_3, android.media.MediaDrm.HDCP_NO_DIGITAL_OUTPUT}) @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE) public static @interface MediaDrm.HdcpLevel {













  }



























  public static final class MediaDrm.KeyRequest {















    method @NonNull public byte[] getData();















    method @NonNull public String getDefaultUrl();










@@ -23031,9 +23028,6 @@ package android.media {













    method @NonNull public String getDefaultUrl();















  }



























  @Deprecated @IntDef({android.media.MediaDrm.SECURITY_LEVEL_UNKNOWN, android.media.MediaDrm.SECURITY_LEVEL_SW_SECURE_CRYPTO, android.media.MediaDrm.SECURITY_LEVEL_SW_SECURE_DECODE, android.media.MediaDrm.SECURITY_LEVEL_HW_SECURE_CRYPTO, android.media.MediaDrm.SECURITY_LEVEL_HW_SECURE_DECODE, android.media.MediaDrm.SECURITY_LEVEL_HW_SECURE_ALL}) @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE) public static @interface MediaDrm.SecurityLevel {













  }



























  public static final class MediaDrm.SessionException extends java.lang.RuntimeException implements android.media.MediaDrmThrowable {















    ctor public MediaDrm.SessionException(int, @Nullable String);















    method @Deprecated public int getErrorCode();

























core/api/removed.txt



+6
−0




























Original line number
Diff line number
Diff line








@@ -224,6 +224,12 @@ package android.media {













    ctor public AudioFormat();















  }





























  @Deprecated @IntDef({android.media.MediaDrm.HDCP_LEVEL_UNKNOWN, android.media.MediaDrm.HDCP_NONE, android.media.MediaDrm.HDCP_V1, android.media.MediaDrm.HDCP_V2, android.media.MediaDrm.HDCP_V2_1, android.media.MediaDrm.HDCP_V2_2, android.media.MediaDrm.HDCP_V2_3, android.media.MediaDrm.HDCP_NO_DIGITAL_OUTPUT}) @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE) public static @interface MediaDrm.HdcpLevel {













  }



























  @Deprecated @IntDef({android.media.MediaDrm.SECURITY_LEVEL_UNKNOWN, android.media.MediaDrm.SECURITY_LEVEL_SW_SECURE_CRYPTO, android.media.MediaDrm.SECURITY_LEVEL_SW_SECURE_DECODE, android.media.MediaDrm.SECURITY_LEVEL_HW_SECURE_CRYPTO, android.media.MediaDrm.SECURITY_LEVEL_HW_SECURE_DECODE, android.media.MediaDrm.SECURITY_LEVEL_HW_SECURE_ALL}) @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE) public static @interface MediaDrm.SecurityLevel {













  }





























}































package android.media.tv {

































media/java/android/media/MediaDrm.java



+4
−0




























Original line number
Diff line number
Diff line








@@ -2018,6 +2018,8 @@ public final class MediaDrm implements AutoCloseable {













     * {@link #HDCP_V2_1},















     * {@link #HDCP_V2_2},















     * {@link #HDCP_V2_3}













     *













     * @removed mistakenly exposed previously















     */















    @Deprecated















    @Retention(RetentionPolicy.SOURCE)










@@ -2121,6 +2123,8 @@ public final class MediaDrm implements AutoCloseable {













     * {@link #SECURITY_LEVEL_HW_SECURE_CRYPTO},















     * {@link #SECURITY_LEVEL_HW_SECURE_DECODE},















     * {@link #SECURITY_LEVEL_HW_SECURE_ALL}













     *













     * @removed mistakenly exposed previously















     */















    @Deprecated















    @Retention(RetentionPolicy.SOURCE)