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

Commit c918d4ae authored by The Android Open Source Project's avatar The Android Open Source Project
Browse files

Merge commit 'korg/cupcake' 

Conflicts:
	core/java/android/webkit/WebView.java
	core/java/android/widget/TwoLineListItem.java
	preloaded-classes
parents 6c5b2102 e47562d6

include/media/AudioRecord.h

+1 −0
Original line number Diff line number Diff line
@@ -335,6 +335,7 @@ private: 
    uint32_t                mNotificationFrames;

    uint32_t                mRemainingFrames;

    uint32_t                mMarkerPosition;

    bool                    mMarkerReached;

    uint32_t                mNewPosition;

    uint32_t                mUpdatePeriod;

};

include/media/AudioSystem.h

+1 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ public: 
        ALARM           = 4,

        NOTIFICATION    = 5,

        BLUETOOTH_SCO   = 6,

        ENFORCED_AUDIBLE = 7, // Sounds that cannot be muted by user and must be routed to speaker

        NUM_STREAM_TYPES

    };

include/media/AudioTrack.h

+1 −0
Original line number Diff line number Diff line
@@ -409,6 +409,7 @@ private: 
    int                     mLoopCount;

    uint32_t                mRemainingFrames;

    uint32_t                mMarkerPosition;

    bool                    mMarkerReached;

    uint32_t                mNewPosition;

    uint32_t                mUpdatePeriod;

};

include/media/mediaplayer.h

+1 −0
Original line number Diff line number Diff line
@@ -173,6 +173,7 @@ private: 
    };



    sp<IMediaPlayer>            mPlayer;

    thread_id_t                 mLockThreadId;

    Mutex                       mLock;

    Mutex                       mNotifyLock;

    Condition                   mSignal;

include/media/mediarecorder.h

+2 −1
Original line number Diff line number Diff line
@@ -104,7 +104,8 @@ enum media_recorder_error_type { 
// 

enum media_recorder_info_type {

    MEDIA_RECORDER_INFO_UNKNOWN                   = 1,

    MEDIA_RECORDER_INFO_MAX_DURATION_REACHED      = 800

    MEDIA_RECORDER_INFO_MAX_DURATION_REACHED      = 800,

    MEDIA_RECORDER_INFO_MAX_FILESIZE_REACHED      = 801

};



// ----------------------------------------------------------------------------