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 am: 3b8756f053

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

Change-Id: I1b0d35f77c38ee2425dc74fa6b9b2e84f1165c19
This commit is contained in:
Treehugger Robot
2020-08-11 09:41:10 +00:00
committed by Automerger Merge Worker
parent 5fed70ab92 3b8756f053
commit 2fed99d3c0
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

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