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

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

Snap for 5605988 from f3540722 to qt-release 

Change-Id: I33a18e33b91e9ab19d77ae917c1cd5010ff46053
parents 073a6d2d f3540722

cmds/bootanimation/BootAnimation.cpp

+5 −2
Original line number Original line Diff line number Diff line
@@ -66,6 +66,7 @@ 
namespace android {

namespace android {





static const char OEM_BOOTANIMATION_FILE[] = "/oem/media/bootanimation.zip";

static const char OEM_BOOTANIMATION_FILE[] = "/oem/media/bootanimation.zip";

static const char PRODUCT_BOOTANIMATION_DARK_FILE[] = "/product/media/bootanimation-dark.zip";

static const char PRODUCT_BOOTANIMATION_FILE[] = "/product/media/bootanimation.zip";

static const char PRODUCT_BOOTANIMATION_FILE[] = "/product/media/bootanimation.zip";

static const char SYSTEM_BOOTANIMATION_FILE[] = "/system/media/bootanimation.zip";

static const char SYSTEM_BOOTANIMATION_FILE[] = "/system/media/bootanimation.zip";

static const char PRODUCT_ENCRYPTED_BOOTANIMATION_FILE[] = "/product/media/bootanimation-encrypted.zip";

static const char PRODUCT_ENCRYPTED_BOOTANIMATION_FILE[] = "/product/media/bootanimation-encrypted.zip";
@@ -141,7 +142,6 @@ sp<SurfaceComposerClient> BootAnimation::session() const { 
    return mSession;

    return mSession;

}

}







void BootAnimation::binderDied(const wp<IBinder>&)

void BootAnimation::binderDied(const wp<IBinder>&)

{

{

    // woah, surfaceflinger died!

    // woah, surfaceflinger died!
@@ -355,8 +355,11 @@ void BootAnimation::findBootAnimationFile() { 
            }

            }

        }

        }

    }

    }



    const bool playDarkAnim = android::base::GetIntProperty("ro.boot.theme", 0) == 1;

    static const char* bootFiles[] =

    static const char* bootFiles[] =

        {PRODUCT_BOOTANIMATION_FILE, OEM_BOOTANIMATION_FILE, SYSTEM_BOOTANIMATION_FILE};

        {playDarkAnim ? PRODUCT_BOOTANIMATION_DARK_FILE : PRODUCT_BOOTANIMATION_FILE,

         OEM_BOOTANIMATION_FILE, SYSTEM_BOOTANIMATION_FILE};

    static const char* shutdownFiles[] =

    static const char* shutdownFiles[] =

        {PRODUCT_SHUTDOWNANIMATION_FILE, OEM_SHUTDOWNANIMATION_FILE, SYSTEM_SHUTDOWNANIMATION_FILE};

        {PRODUCT_SHUTDOWNANIMATION_FILE, OEM_SHUTDOWNANIMATION_FILE, SYSTEM_SHUTDOWNANIMATION_FILE};

cmds/incidentd/src/FdBuffer.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -31,7 +31,7 @@ namespace os { 
namespace incidentd {

namespace incidentd {





const ssize_t BUFFER_SIZE = 16 * 1024;  // 16 KB

const ssize_t BUFFER_SIZE = 16 * 1024;  // 16 KB

const ssize_t MAX_BUFFER_COUNT = 1536;   // 24 MB max

const ssize_t MAX_BUFFER_COUNT = 6144;   // 96 MB max





FdBuffer::FdBuffer()

FdBuffer::FdBuffer()

        :mBuffer(new EncodedBuffer(BUFFER_SIZE)),

        :mBuffer(new EncodedBuffer(BUFFER_SIZE)),

cmds/incidentd/src/IncidentService.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -43,7 +43,7 @@ enum { 




#define DEFAULT_DELAY_NS (1000000000LL)

#define DEFAULT_DELAY_NS (1000000000LL)





#define DEFAULT_BYTES_SIZE_LIMIT (20 * 1024 * 1024)        // 20MB

#define DEFAULT_BYTES_SIZE_LIMIT (96 * 1024 * 1024)        // 96MB

#define DEFAULT_REFACTORY_PERIOD_MS (24 * 60 * 60 * 1000)  // 1 Day

#define DEFAULT_REFACTORY_PERIOD_MS (24 * 60 * 60 * 1000)  // 1 Day





// Skip these sections for dumpstate only. Dumpstate allows 10s max for each service to dump.

// Skip these sections for dumpstate only. Dumpstate allows 10s max for each service to dump.

cmds/incidentd/src/WorkDirectory.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -498,7 +498,7 @@ status_t ReportFile::load_envelope_impl(bool cleanup) { 
WorkDirectory::WorkDirectory()

WorkDirectory::WorkDirectory()

        :mDirectory("/data/misc/incidents"),

        :mDirectory("/data/misc/incidents"),

         mMaxFileCount(100),

         mMaxFileCount(100),

         mMaxDiskUsageBytes(30 * 1024 * 1024) {  // Incident reports can take up to 30MB on disk.

         mMaxDiskUsageBytes(100 * 1024 * 1024) {  // Incident reports can take up to 100MB on disk.

                                                 // TODO: Should be a flag.

                                                 // TODO: Should be a flag.

    create_directory(mDirectory.c_str());

    create_directory(mDirectory.c_str());

}

}

cmds/incidentd/testdata/morethan24MB.txt

deleted100644 → 0
+0 −1

File deleted.

Preview size limit exceeded, changes collapsed.