| commit | 210c960c570158fbcf3de334d785fcbefee744d3 | [log] [tgz] |
|---|---|---|
| author | chihhangchuang <chihhangchuang@google.com> | Tue Jun 02 12:38:14 2020 +0800 |
| committer | chihhangchuang <chihhangchuang@google.com> | Tue Jun 02 13:02:22 2020 +0800 |
| tree | 78593bc66b659c378203f8b10eea73246c5108f6 | |
| parent | 6ce487fd2c4518a4364d156bdf94faa09f363fce [diff] [blame] |
Exit app after a wallpaper is applied Video for all apply button: https://drive.google.com/file/d/14hlFH42wULH2IEl96xD6ReOf-gvb05Bw/view?usp=sharing The daily rotatio button also exit app. Test: Manually Bug: 157951178 Change-Id: I171275555925038b28ca31f058b8a5958fb2534f
diff --git a/src/com/android/wallpaper/module/DefaultWallpaperPersister.java b/src/com/android/wallpaper/module/DefaultWallpaperPersister.java index 2e23338..b5cab4d 100755 --- a/src/com/android/wallpaper/module/DefaultWallpaperPersister.java +++ b/src/com/android/wallpaper/module/DefaultWallpaperPersister.java
@@ -491,8 +491,8 @@ @Override public void onLiveWallpaperSet() { android.app.WallpaperInfo currentWallpaperComponent = mWallpaperManager.getWallpaperInfo(); - android.app.WallpaperInfo previewedWallpaperComponent = - mWallpaperInfoInPreview.getWallpaperComponent(); + android.app.WallpaperInfo previewedWallpaperComponent = mWallpaperInfoInPreview != null + ? mWallpaperInfoInPreview.getWallpaperComponent() : null; // If there is no live wallpaper set on the WallpaperManager or it doesn't match the // WallpaperInfo which was last previewed, then do nothing and nullify last previewed