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

Commit 4aedc3bd authored by Aurélien Pomini's avatar Aurélien Pomini
Browse files

Fix b/318722891 (unwanted onSurfaceCreated event) 

Inside updateSurface, use onVisibilityChanged directly instead of
doVisibilityChanged when a surface has been created. doVisibilityChanged
will trigger another call to updateSurface wich will check for
"mSurfaceCreated" to see if we need to create the surface. But at this
point the first call of updateSurface has created the surface but not
yet flipped the "mSurfaceCreated" boolean (it is done right after the
doVisibilityChanged call). Using onVisibilityChanged fixes the issue:
also we're guaranteed that the wallpaper is invisible when calling
onVisibilityChangedt(true) since there is a if (!mReportedVisible)
check.

Flag: ACONFIG com.android.window.flags.no_consecutive_visibility_events
STAGING
Bug: 318722891
Test: atest WallpaperManagerTest

Change-Id: Ia4b775454ea9f3a57f78b55c29d56879773f5e76
parent 9dc8cf6e

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

+5 −5
Original line number Diff line number Diff line
@@ -1439,12 +1439,12 @@ public abstract class WallpaperService extends Service { 
                                // to make sure the wallpaper is stopped even after the events

                                // onSurfaceCreated() and onSurfaceChanged().

                                if (noConsecutiveVisibilityEvents()) {

                                    if (DEBUG) Log.v(TAG, "toggling doVisibilityChanged");

                                    Trace.beginSection("WPMS.Engine.doVisibilityChanged-true");

                                    doVisibilityChanged(true);

                                    if (DEBUG) Log.v(TAG, "toggling onVisibilityChanged");

                                    Trace.beginSection("WPMS.Engine.onVisibilityChanged-true");

                                    onVisibilityChanged(true);

                                    Trace.endSection();

                                    Trace.beginSection("WPMS.Engine.doVisibilityChanged-false");

                                    doVisibilityChanged(false);

                                    Trace.beginSection("WPMS.Engine.onVisibilityChanged-false");

                                    onVisibilityChanged(false);

                                    Trace.endSection();

                                } else {

                                    if (DEBUG) {