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

Commit 5ad63af5 authored by Anton Hansson's avatar Anton Hansson Committed by Android (Google) Code Review
Browse files

Merge changes from topic "xa-pub" into main 

* changes:
  Hide mistakenly exposed public typedef annotations
  Make all typedefs SOURCE retention
parents ca415f81 a2b33caf

core/api/current.txt

+6 −12
Original line number Diff line number Diff line
@@ -22807,11 +22807,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();
@@ -22825,13 +22825,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[]);
@@ -22843,7 +22843,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);
@@ -22932,9 +22932,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();










@@ -23036,9 +23033,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 {

































core/api/system-current.txt



+1
−1




























Original line number
Diff line number
Diff line








@@ -4763,7 +4763,7 @@ package android.hardware.hdmi {













    method public void onChange(@NonNull String);















  }



























  @IntDef({android.hardware.hdmi.HdmiControlManager.RESULT_SUCCESS, android.hardware.hdmi.HdmiControlManager.RESULT_TIMEOUT, android.hardware.hdmi.HdmiControlManager.RESULT_SOURCE_NOT_AVAILABLE, android.hardware.hdmi.HdmiControlManager.RESULT_TARGET_NOT_AVAILABLE, android.hardware.hdmi.HdmiControlManager.RESULT_ALREADY_IN_PROGRESS, android.hardware.hdmi.HdmiControlManager.RESULT_EXCEPTION, android.hardware.hdmi.HdmiControlManager.RESULT_INCORRECT_MODE, android.hardware.hdmi.HdmiControlManager.RESULT_COMMUNICATION_FAILED}) @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) public static @interface HdmiControlManager.ControlCallbackResult {













  @IntDef({android.hardware.hdmi.HdmiControlManager.RESULT_SUCCESS, android.hardware.hdmi.HdmiControlManager.RESULT_TIMEOUT, android.hardware.hdmi.HdmiControlManager.RESULT_SOURCE_NOT_AVAILABLE, android.hardware.hdmi.HdmiControlManager.RESULT_TARGET_NOT_AVAILABLE, android.hardware.hdmi.HdmiControlManager.RESULT_ALREADY_IN_PROGRESS, android.hardware.hdmi.HdmiControlManager.RESULT_EXCEPTION, android.hardware.hdmi.HdmiControlManager.RESULT_INCORRECT_MODE, android.hardware.hdmi.HdmiControlManager.RESULT_COMMUNICATION_FAILED}) @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE) public static @interface HdmiControlManager.ControlCallbackResult {















  }





























  public static interface HdmiControlManager.HotplugEventListener {

























core/java/android/accessibilityservice/AccessibilityServiceInfo.java



+1
−0




























Original line number
Diff line number
Diff line








@@ -632,6 +632,7 @@ public class AccessibilityServiceInfo implements Parcelable {













            InputDevice.SOURCE_JOYSTICK,















            InputDevice.SOURCE_SENSOR















    })













    @Retention(RetentionPolicy.SOURCE)















    public @interface MotionEventSources {}































    /**

































core/java/android/accessibilityservice/TouchInteractionController.java



+3
−0




























Original line number
Diff line number
Diff line








@@ -24,6 +24,8 @@ import android.util.ArrayMap;













import android.view.MotionEvent;















import android.view.accessibility.AccessibilityInteractionClient;





























import java.lang.annotation.Retention;













import java.lang.annotation.RetentionPolicy;















import java.util.LinkedList;















import java.util.Queue;















import java.util.concurrent.Executor;










@@ -92,6 +94,7 @@ public final class TouchInteractionController {













        STATE_DRAGGING,















        STATE_DELEGATING















    })













    @Retention(RetentionPolicy.SOURCE)















    private @interface State {}































    // The maximum number of pointers that can be touching the screen at once. (See MAX_POINTER_ID