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

Commit 38aca4f9 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 7519874 from 5dc2372a to sc-release 

Change-Id: Ia51e40ae354bca6815c098ba4e86e6385714f33a
parents c0c11bf9 5dc2372a

cmds/dumpstate/dumpstate.cpp

+4 −0
Original line number Diff line number Diff line
@@ -176,6 +176,7 @@ void add_mountinfo(); 
#define LINKERCONFIG_DIR "/linkerconfig"

#define PACKAGE_DEX_USE_LIST "/data/system/package-dex-usage.list"

#define SYSTEM_TRACE_SNAPSHOT "/data/misc/perfetto-traces/bugreport/systrace.pftrace"

#define CGROUPFS_DIR "/sys/fs/cgroup"



// TODO(narayan): Since this information has to be kept in sync

// with tombstoned, we should just put it in a common header.
@@ -1785,6 +1786,9 @@ static Dumpstate::RunStatus dumpstate() { 
    // Add linker configuration directory

    ds.AddDir(LINKERCONFIG_DIR, true);



    /* Dump cgroupfs */

    ds.AddDir(CGROUPFS_DIR, true);



    if (ds.dump_pool_) {

        WAIT_TASK_WITH_CONSENT_CHECK(DUMP_INCIDENT_REPORT_TASK, ds.dump_pool_);

    } else {

cmds/installd/dexopt.cpp

+16 −0
Original line number Diff line number Diff line
@@ -492,6 +492,14 @@ class RunProfman : public ExecVHelper { 
                 std::to_string(min_new_methods_percent_change));

        }



        // On-device signing related. odsign sets the system property odsign.verification.success if

        // AOT artifacts have the expected signatures.

        const bool trust_art_apex_data_files =

                ::android::base::GetBoolProperty("odsign.verification.success", false);

        if (!trust_art_apex_data_files) {

            AddRuntimeArg("-Xdeny-art-apex-data-files");

        }



        // Do not add after dex2oat_flags, they should override others for debugging.

        PrepareArgs(profman_bin);

    }
@@ -1231,6 +1239,14 @@ class RunDexoptAnalyzer : public ExecVHelper { 
            }

        }



        // On-device signing related. odsign sets the system property odsign.verification.success if

        // AOT artifacts have the expected signatures.

        const bool trust_art_apex_data_files =

                ::android::base::GetBoolProperty("odsign.verification.success", false);

        if (!trust_art_apex_data_files) {

            AddRuntimeArg("-Xdeny-art-apex-data-files");

        }



        PrepareArgs(dexoptanalyzer_bin);

    }

cmds/installd/run_dex2oat.cpp

+7 −0
Original line number Diff line number Diff line
@@ -283,6 +283,13 @@ void RunDex2Oat::PrepareCompilerConfigFlags(const UniqueFile& input_vdex, 
        }

    }



    // On-device signing related. odsign sets the system property odsign.verification.success if

    // AOT artifacts have the expected signatures.

    const bool trust_art_apex_data_files = GetBoolProperty("odsign.verification.success", false);

    if (!trust_art_apex_data_files) {

        AddRuntimeArg("-Xdeny-art-apex-data-files");

    }



    if (target_sdk_version != 0) {

        AddRuntimeArg(StringPrintf("-Xtarget-sdk-version:%d", target_sdk_version));

    }

include/input/Input.h

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ enum { 
    AKEY_EVENT_FLAG_IS_ACCESSIBILITY_EVENT =

            android::os::IInputConstants::INPUT_EVENT_FLAG_IS_ACCESSIBILITY_EVENT, // 0x800,

#else

    AKEY_EVENT_FLAG_IS_ACCESSIBILITY_EVENT = 0x800;

    AKEY_EVENT_FLAG_IS_ACCESSIBILITY_EVENT = 0x800,

#endif

    /* Signifies that the key is being predispatched */

    AKEY_EVENT_FLAG_PREDISPATCH = 0x20000000,

libs/gui/bufferqueue/1.0/Conversion.cpp

+10 −8
Original line number Diff line number Diff line
@@ -1194,7 +1194,8 @@ constexpr size_t minFlattenedSize( 
            sizeof(int) +               // scalingMode

            sizeof(uint32_t) +          // transform

            sizeof(uint32_t) +          // stickyTransform

            sizeof(bool); // getFrameTimestamps

            sizeof(bool) +              // getFrameTimestamps

            sizeof(int);                // slot

}



/**
@@ -1267,6 +1268,7 @@ status_t flatten(HGraphicBufferProducer::QueueBufferInput const& t, 
        return status;

    }

    FlattenableUtils::write(buffer, size, decltype(HdrMetadata::validTypes)(0));

    FlattenableUtils::write(buffer, size, -1 /*slot*/);

    return NO_ERROR;

}
@@ -1319,7 +1321,7 @@ status_t unflatten( 
    if (status != NO_ERROR) {

        return status;

    }

    // HdrMetadata ignored

    // HdrMetadata and slot ignored

    return unflatten(&(t->surfaceDamage), buffer, size);

}