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

Commit 0077207c authored by Aurélien Pomini's avatar Aurélien Pomini
Browse files

Clear the right target upon wallpaper failure. 

FLAG_SYSTEM is simply wrong. We want to clear the destination where the
wallpaper crashed.

Failing to do so can lead to hard-to-recover states.

Flag: EXEMPT bugfix
Bug: 412664991
Test: atest WallpaperManagerTest
Change-Id: Ibf72d81a55525623c5c588a2e5de0e1791911ebc
parent bcfa0d64

services/core/java/com/android/server/wallpaper/WallpaperManagerService.java

+2 −1
Original line number Diff line number Diff line
@@ -1269,7 +1269,8 @@ public class WallpaperManagerService extends IWallpaperManager.Stub 
                                    && mWallpaper.lastDiedTime + MIN_WALLPAPER_CRASH_TIME

                                    > SystemClock.uptimeMillis()) {

                                Slog.w(TAG, "Reverting to built-in wallpaper!");

                                clearWallpaperLocked(FLAG_SYSTEM, mWallpaper.userId, false, null);

                                clearWallpaperLocked(

                                        mWallpaper.mWhich, mWallpaper.userId, false, null);

                            } else {

                                mWallpaper.lastDiedTime = SystemClock.uptimeMillis();

                                tryToRebind();