Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update language to comply with Android's inclusive language guidance" am: bad5c4ec49 am: 99ed998f0e am: 31af0da082 am: a23c657c17

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

Change-Id: Id90b2b13d47d274ba2c40bccbf0507d05011c576
This commit is contained in:
Treehugger Robot
2020-08-11 09:15:02 +00:00
committed by Automerger Merge Worker
parent 3c68185224 a23c657c17
commit 3b8756f053
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
View File

@@ -3084,7 +3084,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),