Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Prevent duplicate calls to updateSurface() and recursive call to updateSurfaceDimming()." into tm-dev

Browse Source
This commit is contained in:
Vania Desmonda
2022-05-13 07:01:18 +00:00
committed by Android (Google) Code Review
parent 65f8aea175 41af1e31d3
commit eb0f10153f
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java/android/service/wallpaper/WallpaperService.java
View File

@@ -888,7 +888,6 @@ public abstract class WallpaperService extends Service {
if (mShouldDimByDefault != mShouldDim && mWallpaperDimAmount == 0f) { if (mShouldDimByDefault != mShouldDim && mWallpaperDimAmount == 0f) {
mShouldDim = mShouldDimByDefault; mShouldDim = mShouldDimByDefault;
updateSurfaceDimming(); updateSurfaceDimming();
updateSurface(false, false, true);
} }
} }
@@ -898,13 +897,16 @@ public abstract class WallpaperService extends Service {
* @param dimAmount Float amount between [0.0, 1.0] to dim the wallpaper. * @param dimAmount Float amount between [0.0, 1.0] to dim the wallpaper.
*/ */
private void updateWallpaperDimming(float dimAmount) { private void updateWallpaperDimming(float dimAmount) {
if (dimAmount == mWallpaperDimAmount) {
return;
}
// Custom dim amount cannot be less than the default dim amount. // Custom dim amount cannot be less than the default dim amount.
mWallpaperDimAmount = Math.max(mDefaultDimAmount, dimAmount); mWallpaperDimAmount = Math.max(mDefaultDimAmount, dimAmount);
// If dim amount is 0f (additional dimming is removed), then the wallpaper should dim // If dim amount is 0f (additional dimming is removed), then the wallpaper should dim
// based on its default wallpaper color hints. // based on its default wallpaper color hints.
mShouldDim = dimAmount != 0f || mShouldDimByDefault; mShouldDim = dimAmount != 0f || mShouldDimByDefault;
updateSurfaceDimming(); updateSurfaceDimming();
updateSurface(false, false, true);
} }
private void updateSurfaceDimming() { private void updateSurfaceDimming() {
@@ -941,6 +943,7 @@ public abstract class WallpaperService extends Service {
} else { } else {
Log.v(TAG, "Setting wallpaper dimming: " + 0); Log.v(TAG, "Setting wallpaper dimming: " + 0);
surfaceControlTransaction.setAlpha(mBbqSurfaceControl, 1.0f).apply(); surfaceControlTransaction.setAlpha(mBbqSurfaceControl, 1.0f).apply();
updateSurface(false, false, true);
} }
mPreviousWallpaperDimAmount = mWallpaperDimAmount; mPreviousWallpaperDimAmount = mWallpaperDimAmount;
@@ -1195,7 +1198,6 @@ public abstract class WallpaperService extends Service {
.setParent(mSurfaceControl) .setParent(mSurfaceControl)
.setCallsite("Wallpaper#relayout") .setCallsite("Wallpaper#relayout")
.build(); .build();
updateSurfaceDimming();
} }
// Propagate transform hint from WM, so we can use the right hint for the // Propagate transform hint from WM, so we can use the right hint for the
// first frame. // first frame.
@@ -1366,7 +1368,6 @@ public abstract class WallpaperService extends Service {
mSession.finishDrawing(mWindow, null /* postDrawTransaction */, mSession.finishDrawing(mWindow, null /* postDrawTransaction */,
Integer.MAX_VALUE); Integer.MAX_VALUE);
processLocalColors(mPendingXOffset, mPendingXOffsetStep); processLocalColors(mPendingXOffset, mPendingXOffsetStep);
notifyColorsChanged();
} }
reposition(); reposition();
reportEngineShown(shouldWaitForEngineShown()); reportEngineShown(shouldWaitForEngineShown());