commit 73c98f291d86ce9f60e49572afdbaf00d14057e9
author Chuck Liao <chuckliao@google.com> Mon Aug 17 16:29:24 2020 +0800
committer Chuck Liao <chuckliao@google.com> Mon Aug 17 16:29:24 2020 +0800
tree a1d2591b0e880f065733b321d98b354871443064
parent d90db31447a4cccf8d32de5d7134007f6b53d7a4

Fix the exception when calling PreviewFragment#finishActivity() but the activity has already finished.

Bug: 164928805
Change-Id: I94e8d55bded75cf995582ea25fcebca88c37024e

src/com/android/wallpaper/picker/PreviewFragment.java

diff --git a/src/com/android/wallpaper/picker/PreviewFragment.java b/src/com/android/wallpaper/picker/PreviewFragment.java
index 8963d60..c5c95ec 100755
--- a/src/com/android/wallpaper/picker/PreviewFragment.java
+++ b/src/com/android/wallpaper/picker/PreviewFragment.java
@@ -313,7 +313,10 @@
     protected abstract void setCurrentWallpaper(@Destination int destination);
 
     protected void finishActivity(boolean success) {
-        Activity activity = requireActivity();
+        Activity activity = getActivity();
+        if (activity == null) {
+            return;
+        }
         if (success) {
             try {
                 Toast.makeText(activity,