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

Commit 3142705c authored by Riddle Hsu's avatar Riddle Hsu Committed by Android (Google) Code Review
Browse files

Merge "Remove override prepareSurfaces of Task" into main

parents 4c76ce48 68ed2609

services/core/java/com/android/server/wm/Task.java

+0 −10
Original line number Original line Diff line number Diff line
@@ -3366,16 +3366,6 @@ class Task extends TaskFragment { 
        return inMultiWindowMode() || !isTranslucentAndVisible();

        return inMultiWindowMode() || !isTranslucentAndVisible();

    }

    }





    @Override

    void prepareSurfaces() {

        mDimmer.resetDimStates();

        super.prepareSurfaces();



        if (mDimmer.hasDimState() && mDimmer.updateDims(getSyncTransaction())) {

            scheduleAnimation();

        }

    }



    @Override

    @Override

    void updateSurfaceVisibility(SurfaceControl.Transaction t) {

    void updateSurfaceVisibility(SurfaceControl.Transaction t) {

        t.setVisibility(mSurfaceControl, isVisible());

        t.setVisibility(mSurfaceControl, isVisible());

services/core/java/com/android/server/wm/TaskFragment.java

+1 −6
Original line number Original line Diff line number Diff line
@@ -3389,15 +3389,10 @@ class TaskFragment extends WindowContainer<WindowContainer> { 




    @Override

    @Override

    void prepareSurfaces() {

    void prepareSurfaces() {

        if (asTask() != null) {

            super.prepareSurfaces();

            return;

        }



        mDimmer.resetDimStates();

        mDimmer.resetDimStates();

        super.prepareSurfaces();

        super.prepareSurfaces();





        if (mDimmer.updateDims(getSyncTransaction())) {

        if (mDimmer.hasDimState() && mDimmer.updateDims(getSyncTransaction())) {

            scheduleAnimation();

            scheduleAnimation();

        }

        }

    }

    }