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

Commit 31af0da0 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

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

Change-Id: Ibea8b326aba347acfd948310378580940c3f0cd7
parents 3ae0c9d3 99ed998f

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

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

                    ensureSaneWallpaperData(wallpaper);

                } 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.

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

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