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

Commit e3f4269b authored by Tetsutoki Shiozawa's avatar Tetsutoki Shiozawa Committed by Christopher Tate
Browse files

Explicitly restart the killed wallpaper service 

Symptom:
Live wallpaper setting was reset when a wallpaper service was killed
by Lmk. The wallpaper fell back to the default image wallpaper. It's
a black bitmap.

Root cause:
When restarting wallpaper service takes more than 10 seconds, it's
treated as a bad wallpaper. The wallpaper setting is reset to remove
the bad wallpaper.

This is not a suitable solution under the low memory situation.
Multiple processes are killed by Lmk at one time. Killed services are
automatically restarted by AMS with a few seconds interval.
The restart interval is increased by a factor of the number of killed
services. Sometimes, it takes more than 1 minute.

Solution:
When a wallpaper service is killed, WallpaperManagerService requests
restarting the service immediately. It can ignore the restart interval.

Bug: 73071020
Test: atest CtsAppTestCases:WallpaperManagerTest
Change-Id: Id5bb1cf121029a513f8773597f296b47667d1e21
parent 3190439f

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

+18 −7
Original line number Diff line number Diff line
@@ -859,6 +859,17 @@ public class WallpaperManagerService extends IWallpaperManager.Stub 
            }

        }



        public void scheduleTimeoutLocked() {

            // If we didn't reset it right away, do so after we couldn't connect to

            // it for an extended amount of time to avoid having a black wallpaper.

            final Handler fgHandler = FgThread.getHandler();

            fgHandler.removeCallbacks(mResetRunnable);

            fgHandler.postDelayed(mResetRunnable, WALLPAPER_RECONNECT_TIMEOUT_MS);

            if (DEBUG_LIVE) {

                Slog.i(TAG, "Started wallpaper reconnect timeout for " + mWallpaper.wallpaperComponent);

            }

        }



        private void processDisconnect(final ServiceConnection connection) {

            synchronized (mLock) {

                // The wallpaper disappeared.  If this isn't a system-default one, track
@@ -883,13 +894,13 @@ public class WallpaperManagerService extends IWallpaperManager.Stub 
                        } else {

                            mWallpaper.lastDiedTime = SystemClock.uptimeMillis();



                            // If we didn't reset it right away, do so after we couldn't connect to

                            // it for an extended amount of time to avoid having a black wallpaper.

                            final Handler fgHandler = FgThread.getHandler();

                            fgHandler.removeCallbacks(mResetRunnable);

                            fgHandler.postDelayed(mResetRunnable, WALLPAPER_RECONNECT_TIMEOUT_MS);

                            if (DEBUG_LIVE) {

                                Slog.i(TAG, "Started wallpaper reconnect timeout for " + wpService);

                            clearWallpaperComponentLocked(mWallpaper);

                            if (bindWallpaperComponentLocked(

                                    wpService, false, false, mWallpaper, null)) {

                                mWallpaper.connection.scheduleTimeoutLocked();

                            } else {

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

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

                            }

                        }

                        final String flattened = wpService.flattenToString();