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

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

Change-Id: I8f14f27529dc42e4bf8515ce317024f468622b54
This commit is contained in:
Treehugger Robot
2020-08-11 08:57:42 +00:00
committed by Automerger Merge Worker
parent 4dd39b4cb6 31af0da082
commit a23c657c17
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

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