Merge "Update language to comply with Android's inclusive language guidance"
This commit is contained in:
@@ -3038,7 +3038,7 @@ public class WallpaperManagerService extends IWallpaperManager.Stub
|
|||||||
mLockWallpaperMap.put(userId, wallpaper);
|
mLockWallpaperMap.put(userId, wallpaper);
|
||||||
ensureSaneWallpaperData(wallpaper, DEFAULT_DISPLAY);
|
ensureSaneWallpaperData(wallpaper, DEFAULT_DISPLAY);
|
||||||
} 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, WALLPAPER, WALLPAPER_CROP);
|
wallpaper = new WallpaperData(userId, WALLPAPER, WALLPAPER_CROP);
|
||||||
|
|||||||
Reference in New Issue
Block a user