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

Commit 5e2b9374 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 7546601 from e78acd5b to sc-d1-release 

Change-Id: I9929f9d3d965658061ff6d56c50ce08702c3dd0c
parents 2499478d e78acd5b

cmds/installd/dexopt.cpp

+4 −2
Original line number Diff line number Diff line
@@ -1371,10 +1371,12 @@ static SecondaryDexAccess check_secondary_dex_access(const std::string& dex_path 
        return kSecondaryDexAccessReadOk;

    } else {

        if (errno == ENOENT) {

            LOG(INFO) << "Secondary dex does not exist: " <<  dex_path;

            async_safe_format_log(ANDROID_LOG_INFO, LOG_TAG,

                    "Secondary dex does not exist: %s", dex_path.c_str());

            return kSecondaryDexAccessDoesNotExist;

        } else {

            PLOG(ERROR) << "Could not access secondary dex " << dex_path;

            async_safe_format_log(ANDROID_LOG_ERROR, LOG_TAG,

                    "Could not access secondary dex: %s (%d)", dex_path.c_str(), errno);

            return errno == EACCES

                ? kSecondaryDexAccessPermissionError

                : kSecondaryDexAccessIOError;

libs/renderengine/skia/filters/BlurFilter.cpp

+1 −1
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ sk_sp<SkImage> BlurFilter::generate(GrRecordingContext* context, const uint32_t 
    // Kawase is an approximation of Gaussian, but it behaves differently from it.

    // A radius transformation is required for approximating them, and also to introduce

    // non-integer steps, necessary to smoothly interpolate large radii.

    float tmpRadius = (float)blurRadius / 6.0f;

    float tmpRadius = (float)blurRadius / 2.0f;

    float numberOfPasses = std::min(kMaxPasses, (uint32_t)ceil(tmpRadius));

    float radiusByPasses = tmpRadius / (float)numberOfPasses;