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

Commit e0222908 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "Fix wallpaper backup eligibility test am: f7d1b5de" into nyc-mr1-dev

parents f7e16597 100b6100

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -1757,8 +1757,8 @@ public class WallpaperManagerService extends IWallpaperManager.Stub { 
        }

        }





        WallpaperData wallpaper = (which == FLAG_LOCK)

        WallpaperData wallpaper = (which == FLAG_LOCK)

                ? mWallpaperMap.get(userId)

                ? mLockWallpaperMap.get(userId)

                : mLockWallpaperMap.get(userId);

                : mWallpaperMap.get(userId);

        return (wallpaper != null) ? wallpaper.allowBackup : false;

        return (wallpaper != null) ? wallpaper.allowBackup : false;

    }

    }