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

Commit a0469e2f authored by Vania Desmonda's avatar Vania Desmonda Committed by Automerger Merge Worker
Browse files

Merge "Avoid calling updateSurface twice when dimming is applied." into tm-dev... 

Merge "Avoid calling updateSurface twice when dimming is applied." into tm-dev am: bc99f623 am: fa9f19cf am: add6e383

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17982482



Change-Id: I2c066b1fcf037bdece73c5a74a4552eae8069ea4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4876962f add6e383

core/java/android/service/wallpaper/WallpaperService.java

+1 −1
Original line number Diff line number Diff line
@@ -904,7 +904,6 @@ public abstract class WallpaperService extends Service { 
            // based on its default wallpaper color hints.

            mShouldDim = dimAmount != 0f || mShouldDimByDefault;

            updateSurfaceDimming();

            updateSurface(false, false, true);

        }



        private void updateSurfaceDimming() {
@@ -941,6 +940,7 @@ public abstract class WallpaperService extends Service { 
            } else {

                Log.v(TAG, "Setting wallpaper dimming: " + 0);

                surfaceControlTransaction.setAlpha(mBbqSurfaceControl, 1.0f).apply();

                updateSurface(false, false, true);

            }



            mPreviousWallpaperDimAmount = mWallpaperDimAmount;