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

Commit dbd7a5ee authored by Yi Kong's avatar Yi Kong Committed by Android (Google) Code Review
Browse files

Merge "hwui: Fix unused variable warning" into main

parents d67a95f3 7441dafb

libs/hwui/hwui/Bitmap.cpp

+1 −1
Original line number Diff line number Diff line
@@ -692,7 +692,7 @@ void Bitmap::traceBitmapCreate() { 
void Bitmap::traceBitmapDelete() {

    size_t bytes = getAllocationByteCount();

    std::lock_guard lock{mLock};

    mTotalBitmapBytes -= getAllocationByteCount();

    mTotalBitmapBytes -= bytes;

    mTotalBitmapCount--;

    if (ATRACE_ENABLED()) {

        ATRACE_INT64("Bitmap Memory", mTotalBitmapBytes);

libs/hwui/jni/Graphics.cpp

+0 −1
Original line number Diff line number Diff line
@@ -783,7 +783,6 @@ bool AshmemPixelAllocator::allocPixelRef(SkBitmap* bitmap) { 


int register_android_graphics_Graphics(JNIEnv* env)

{

    jmethodID m;

    jclass c;



    gRect_class = MakeGlobalRefOrDie(env, FindClassOrDie(env, "android/graphics/Rect"));

libs/hwui/pipeline/skia/HolePunch.cpp

+1 −1
Original line number Diff line number Diff line
@@ -18,4 +18,4 @@ 


using namespace android::uirenderer::skiapipeline;



const std::string HOLE_PUNCH_ANNOTATION = "surface_hole_punch";

libs/hwui/renderthread/CanvasContext.cpp

+0 −2
Original line number Diff line number Diff line
@@ -812,8 +812,6 @@ void CanvasContext::draw(bool solelyTextureViewUpdates) { 
        }

    }



    int64_t intendedVsync = mCurrentFrameInfo->get(FrameInfoIndex::IntendedVsync);

    int64_t frameDeadline = mCurrentFrameInfo->get(FrameInfoIndex::FrameDeadline);

    int64_t dequeueBufferDuration = mCurrentFrameInfo->get(FrameInfoIndex::DequeueBufferDuration);



    mHintSessionWrapper->updateTargetWorkDuration(