Merge "Stop WPMS from trying to rebind to a disconnected wallpaper service" into main (44c2a9ff) · Commits · e / os / android_frameworks_base

core/java/android/window/flags/wallpaper_manager.aconfig

+10 −0

Original line number	Diff line number	Diff line
		@@ -49,3 +49,13 @@ flag {
		purpose: PURPOSE_BUGFIX
		}
		}

		flag {
		name: "avoid_rebinding_intentionally_disconnected_wallpaper"
		namespace: "systemui"
		description: "Prevents rebinding with intentionally disconnected wallpaper services."
		bug: "332871851"
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}

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

+14 −0

Original line number	Diff line number	Diff line
		@@ -42,6 +42,7 @@ import static com.android.server.wallpaper.WallpaperUtils.WALLPAPER_INFO;
		import static com.android.server.wallpaper.WallpaperUtils.WALLPAPER_LOCK_ORIG;
		import static com.android.server.wallpaper.WallpaperUtils.getWallpaperDir;
		import static com.android.server.wallpaper.WallpaperUtils.makeWallpaperIdLocked;
		import static com.android.window.flags.Flags.avoidRebindingIntentionallyDisconnectedWallpaper;
		import static com.android.window.flags.Flags.multiCrop;
		import static com.android.window.flags.Flags.offloadColorExtraction;

		@@ -897,6 +898,12 @@ public class WallpaperManagerService extends IWallpaperManager.Stub
		return;
		}

		if (avoidRebindingIntentionallyDisconnectedWallpaper()
		&& mWallpaper.connection == null) {
		Slog.w(TAG, "Trying to reset an intentionally disconnected wallpaper!");
		return;
		}

		if (!mWallpaper.wallpaperUpdating && mWallpaper.userId == mCurrentUserId) {
		Slog.w(TAG, "Wallpaper reconnect timed out for " + mWallpaper.wallpaperComponent
		+ ", reverting to built-in wallpaper!");
		@@ -1066,6 +1073,13 @@ public class WallpaperManagerService extends IWallpaperManager.Stub
		if (mWallpaper.wallpaperUpdating) {
		return;
		}

		if (avoidRebindingIntentionallyDisconnectedWallpaper()
		&& mWallpaper.connection == null) {
		Slog.w(TAG, "Trying to rebind an intentionally disconnected wallpaper!");
		return;
		}

		final ComponentName wpService = mWallpaper.wallpaperComponent;
		// The broadcast of package update could be delayed after service disconnected. Try
		// to re-bind the service for 10 seconds.