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

Commit 32b2cee7 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 4686875 from 0c2e7237 to pi-release 

Change-Id: I0f388b8a741b578a2eca57b7f86a5e51019ad142
parents 07baad83 0c2e7237

camera/ndk/include/camera/NdkCameraMetadataTags.h

+8 −0
Original line number Diff line number Diff line
@@ -4807,6 +4807,8 @@ typedef enum acamera_metadata_tag { 
     * of points can be less than max (that is, the request doesn't have to

     * always provide a curve with number of points equivalent to

     * ACAMERA_TONEMAP_MAX_CURVE_POINTS).</p>

     * <p>For devices with MONOCHROME capability, only red channel is used. Green and blue channels

     * are ignored.</p>

     * <p>A few examples, and their corresponding graphical mappings; these

     * only specify the red channel and the precision is limited to 4

     * digits, for conciseness.</p>
@@ -7094,6 +7096,12 @@ typedef enum acamera_metadata_enum_acamera_request_available_capabilities { 
     */

    ACAMERA_REQUEST_AVAILABLE_CAPABILITIES_LOGICAL_MULTI_CAMERA      = 11,



    /**

     * <p>The camera device is a monochrome camera that doesn't contain a color filter array,

     * and the pixel values on U and Y planes are all 128.</p>

     */

    ACAMERA_REQUEST_AVAILABLE_CAPABILITIES_MONOCHROME                = 12,



} acamera_metadata_enum_android_request_available_capabilities_t;

media/mtp/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -49,7 +49,6 @@ cc_library_shared { 
    shared_libs: [

        "libasyncio",

        "libbase",

        "libutils",

        "liblog",

        "libusbhost",

    ],

media/mtp/IMtpDatabase.h

+2 −1
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ namespace android { 
class MtpDataPacket;

class MtpProperty;

class MtpObjectInfo;

class MtpStringBuffer;



class IMtpDatabase {

public:
@@ -86,7 +87,7 @@ public: 
    virtual void*                   getThumbnail(MtpObjectHandle handle, size_t& outThumbSize) = 0;



    virtual MtpResponseCode         getObjectFilePath(MtpObjectHandle handle,

                                            MtpString& outFilePath,

                                            MtpStringBuffer& outFilePath,

                                            int64_t& outFileLength,

                                            MtpObjectFormat& outFormat) = 0;

media/mtp/MtpDataPacket.cpp

+9 −8
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include "MtpDataPacket.h"



#include <algorithm>

#include <errno.h>

#include <fcntl.h>

#include <stdio.h>

#include <sys/types.h>
@@ -129,7 +130,7 @@ Int8List* MtpDataPacket::getAInt8() { 
            delete result;

            return NULL;

        }

        result->push(value);

        result->push_back(value);

    }

    return result;

}
@@ -145,7 +146,7 @@ UInt8List* MtpDataPacket::getAUInt8() { 
            delete result;

            return NULL;

        }

        result->push(value);

        result->push_back(value);

    }

    return result;

}
@@ -161,7 +162,7 @@ Int16List* MtpDataPacket::getAInt16() { 
            delete result;

            return NULL;

        }

        result->push(value);

        result->push_back(value);

    }

    return result;

}
@@ -177,7 +178,7 @@ UInt16List* MtpDataPacket::getAUInt16() { 
            delete result;

            return NULL;

        }

        result->push(value);

        result->push_back(value);

    }

    return result;

}
@@ -193,7 +194,7 @@ Int32List* MtpDataPacket::getAInt32() { 
            delete result;

            return NULL;

        }

        result->push(value);

        result->push_back(value);

    }

    return result;

}
@@ -209,7 +210,7 @@ UInt32List* MtpDataPacket::getAUInt32() { 
            delete result;

            return NULL;

        }

        result->push(value);

        result->push_back(value);

    }

    return result;

}
@@ -225,7 +226,7 @@ Int64List* MtpDataPacket::getAInt64() { 
            delete result;

            return NULL;

        }

        result->push(value);

        result->push_back(value);

    }

    return result;

}
@@ -241,7 +242,7 @@ UInt64List* MtpDataPacket::getAUInt64() { 
            delete result;

            return NULL;

        }

        result->push(value);

        result->push_back(value);

    }

    return result;

}

media/mtp/MtpDebug.h

+2 −2
Original line number Diff line number Diff line
@@ -18,10 +18,10 @@ 
#define _MTP_DEBUG_H



// #define LOG_NDEBUG 0

#include <utils/Log.h>



#include "MtpTypes.h"



#include <log/log.h>



namespace android {



class MtpDebug {