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

Commit 3a4a27cf authored by Wei Jia's avatar Wei Jia Committed by android-build-merger
Browse files

Merge "MediaPlayer2: clarify sync/async for API's" into pi-dev 

am: 97d579d1

Change-Id: I26d1541c0d016181be09afdb172715fda3dc41dc
parents 044a2e74 97d579d1

api/current.txt

+0 −4
Original line number Diff line number Diff line
@@ -24371,8 +24371,6 @@ package android.media { 
    field public static final int MEDIA_CALL_PAUSE = 4; // 0x4

    field public static final int MEDIA_CALL_PLAY = 5; // 0x5

    field public static final int MEDIA_CALL_PREPARE = 6; // 0x6

    field public static final int MEDIA_CALL_PREPARE_DRM = 7; // 0x7

    field public static final int MEDIA_CALL_PROVIDE_DRM_KEY_RESPONSE = 8; // 0x8

    field public static final int MEDIA_CALL_RELEASE_DRM = 12; // 0xc

    field public static final int MEDIA_CALL_RESTORE_DRM_KEYS = 13; // 0xd

    field public static final int MEDIA_CALL_SEEK_TO = 14; // 0xe
@@ -24381,8 +24379,6 @@ package android.media { 
    field public static final int MEDIA_CALL_SET_AUDIO_SESSION_ID = 17; // 0x11

    field public static final int MEDIA_CALL_SET_AUX_EFFECT_SEND_LEVEL = 18; // 0x12

    field public static final int MEDIA_CALL_SET_DATA_SOURCE = 19; // 0x13

    field public static final int MEDIA_CALL_SET_DRM_CONFIG_HELPER = 20; // 0x14

    field public static final int MEDIA_CALL_SET_DRM_PROPERTY_STRING = 21; // 0x15

    field public static final int MEDIA_CALL_SET_NEXT_DATA_SOURCE = 22; // 0x16

    field public static final int MEDIA_CALL_SET_NEXT_DATA_SOURCES = 23; // 0x17

    field public static final int MEDIA_CALL_SET_PLAYBACK_PARAMS = 24; // 0x18

media/java/android/media/MediaPlayer2.java

+89 −67

File changed.

Preview size limit exceeded, changes collapsed.