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

Commit 2fed99d3 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Update language to comply with Android's inclusive language guidance"... 

Merge "Update language to comply with Android's inclusive language guidance" am: bad5c4ec am: 99ed998f am: 31af0da0 am: a23c657c am: 3b8756f0

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

Change-Id: I1b0d35f77c38ee2425dc74fa6b9b2e84f1165c19
parents 5fed70ab 3b8756f0

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -3070,7 +3070,7 @@ public class WallpaperManagerService extends IWallpaperManager.Stub 
                    mLockWallpaperMap.put(userId, wallpaper);

                    mLockWallpaperMap.put(userId, wallpaper);

                    ensureSaneWallpaperData(wallpaper);

                    ensureSaneWallpaperData(wallpaper);

                } else {

                } else {

                    // sanity fallback: we're in bad shape, but establishing a known

                    // rationality fallback: we're in bad shape, but establishing a known

                    // valid system+lock WallpaperData will keep us from dying.

                    // valid system+lock WallpaperData will keep us from dying.

                    Slog.wtf(TAG, "Didn't find wallpaper in non-lock case!");

                    Slog.wtf(TAG, "Didn't find wallpaper in non-lock case!");

                    wallpaper = new WallpaperData(userId, getWallpaperDir(userId),

                    wallpaper = new WallpaperData(userId, getWallpaperDir(userId),