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

Commit 29d6d7ee authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Do not overwrite user set or live wallpapers" into main am: 3ff587dd 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1347163



Change-Id: If0c9e5db27826ab937840394ea9aa76c2d4d7770
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents db90ae77 3ff587dd

services/core/java/com/android/server/WallpaperUpdateReceiver.java

+4 −5
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ import android.content.BroadcastReceiver; 
import android.content.ComponentName;

import android.content.Context;

import android.content.Intent;

import android.graphics.Bitmap;

import android.os.AsyncTask;

import android.os.ParcelFileDescriptor;

import android.util.Slog;
@@ -59,10 +58,10 @@ public class WallpaperUpdateReceiver extends BroadcastReceiver { 
                return;

            }

            if (DEBUG) Slog.d(TAG, "Set customized default_wallpaper.");

            Bitmap blank = Bitmap.createBitmap(1, 1, Bitmap.Config.ALPHA_8);

            // set a blank wallpaper to force a redraw of default_wallpaper

            wallpaperManager.setBitmap(blank);

            wallpaperManager.setResource(com.android.internal.R.drawable.default_wallpaper);

            // Check if it is not a live wallpaper set

            if (wallpaperManager.getWallpaperInfo() == null) {

                wallpaperManager.clearWallpaper();

            }

        } catch (Exception e) {

            Slog.w(TAG, "Failed to customize system wallpaper." + e);

        }