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

Commit 0e93732c authored by Bill Yi's avatar Bill Yi
Browse files

Merge commit 'db5c5bb0' into HEAD

parents 225a2901 db5c5bb0

cmds/dumpstate/dumpstate.cpp

+1 −1
Original line number Diff line number Diff line
@@ -476,7 +476,7 @@ static void dumpstate() { 


    run_command("LOG STATISTICS", 10, "logcat", "-b", "all", "-S", NULL);



    run_command("RAFT LOGS", 300, SU_PATH, "root", "logcompressor", "-r", RAFT_DIR, NULL);

    run_command("RAFT LOGS", 600, SU_PATH, "root", "logcompressor", "-r", RAFT_DIR, NULL);



    /* show the traces we collected in main(), if that was done */

    if (dump_traces_path != NULL) {

include/batteryservice/BatteryService.h

+1 −0
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ struct BatteryProperties { 
    bool chargerUsbOnline;

    bool chargerWirelessOnline;

    int maxChargingCurrent;

    int maxChargingVoltage;

    int batteryStatus;

    int batteryHealth;

    bool batteryPresent;

include/media/openmax/OMX_Core.h

+5 −1
Original line number Diff line number Diff line
@@ -509,7 +509,7 @@ typedef enum OMX_EVENTTYPE 
    OMX_EventKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */

    OMX_EventVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */



    /** Event when tunneled decoder has rendered an output

    /** Event when tunneled decoder has rendered an output or reached EOS

     *  nData1 must contain the number of timestamps returned

     *  pEventData must point to an array of the OMX_VIDEO_RENDEREVENTTYPE structs containing the

     *  render-timestamps of each frame. Component may batch rendered timestamps using this event,
@@ -518,6 +518,10 @@ typedef enum OMX_EVENTTYPE 
     *

     *  If component is doing frame-rate conversion, it must signal the render time of each

     *  converted frame, and must interpolate media timestamps for in-between frames.

     *

     *  When the component reached EOS, it must signal an EOS timestamp using the same mechanism.

     *  This is in addition to the timestamp of the last rendered frame, and should follow that

     *  frame.

     */

    OMX_EventOutputRendered = 0x7F000001,

    OMX_EventMax = 0x7FFFFFFF

include/media/openmax/OMX_VideoExt.h

+8 −1
Original line number Diff line number Diff line
@@ -203,10 +203,17 @@ typedef struct OMX_VIDEO_SLICESEGMENTSTYPE { 
    OMX_BOOL bEnableLoopFilterAcrossSlices;

} OMX_VIDEO_SLICESEGMENTSTYPE;



/** Structure to return timestamps of rendered output frames for tunneled components */

/** Structure to return timestamps of rendered output frames as well as EOS

 *  for tunneled components.

 */

typedef struct OMX_VIDEO_RENDEREVENTTYPE {

    OMX_S64 nMediaTimeUs;  // timestamp of rendered video frame

    OMX_S64 nSystemTimeNs; // system monotonic time at the time frame was rendered

                           // Use INT64_MAX for nMediaTimeUs to signal that the EOS

                           // has been reached. In this case, nSystemTimeNs MUST be

                           // the system time when the last frame was rendered.

                           // This MUST be done in addition to returning (and

                           // following) the render information for the last frame.

} OMX_VIDEO_RENDEREVENTTYPE;



#ifdef __cplusplus

libs/binder/Parcel.cpp

+5 −7
Original line number Diff line number Diff line
@@ -412,13 +412,11 @@ size_t Parcel::dataSize() const 


size_t Parcel::dataAvail() const

{

    // TODO: decide what to do about the possibility that this can

    // report an available-data size that exceeds a Java int's max

    // positive value, causing havoc.  Fortunately this will only

    // happen if someone constructs a Parcel containing more than two

    // gigabytes of data, which on typical phone hardware is simply

    // not possible.

    return dataSize() - dataPosition();

    size_t result = dataSize() - dataPosition();

    if (result > INT32_MAX) {

        abort();

    }

    return result;

}



size_t Parcel::dataPosition() const