commit ec88aec0b128bd71892e36147bd13a2eaefe052e
author John Pan <johnpan@google.com> Mon Jun 27 14:44:39 2022 +0800
committer John Pan <johnpan@google.com> Thu Jun 30 03:43:20 2022 +0000
tree 9efd5689684750dacde63147d988b6828b312a58
parent 851a2705a3d8ab72fc953a8c2a86bf30b41c4c69

Fix wallpaperInfo getAttributions ANR

- Remove activity setTitle in preview fragment
- Load attributions out of main thread in wallpaper info view

Bug: 237053695
Test: Manual
Change-Id: Iac1c901c871ce63d639f82261c0a7e2f08db3ad8

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 5797116..9e9356a 100755
--- a/src/com/android/wallpaper/picker/PreviewFragment.java
+++ b/src/com/android/wallpaper/picker/PreviewFragment.java
@@ -186,12 +186,6 @@
 
         mViewModelProvider = new ViewModelProvider(requireActivity());
         mSetWallpaperViewModel = mViewModelProvider.get(SetWallpaperViewModel.class);
-
-        Activity activity = getActivity();
-        List<String> attributions = getAttributions(activity);
-        if (attributions.size() > 0 && attributions.get(0) != null) {
-            activity.setTitle(attributions.get(0));
-        }
     }
 
     @Override

src/com/android/wallpaper/widget/WallpaperInfoView.java

diff --git a/src/com/android/wallpaper/widget/WallpaperInfoView.java b/src/com/android/wallpaper/widget/WallpaperInfoView.java
index 109279c..c7e4d87 100644
--- a/src/com/android/wallpaper/widget/WallpaperInfoView.java
+++ b/src/com/android/wallpaper/widget/WallpaperInfoView.java
@@ -16,6 +16,8 @@
 package com.android.wallpaper.widget;
 
 import android.content.Context;
+import android.os.Handler;
+import android.os.Looper;
 import android.util.AttributeSet;
 import android.view.View;
 import android.widget.Button;
@@ -29,9 +31,12 @@
 import com.android.wallpaper.model.WallpaperInfo;
 
 import java.util.List;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 
 /** A view for displaying wallpaper info. */
 public class WallpaperInfoView extends LinearLayout {
+    private static final ExecutorService sExecutorService = Executors.newCachedThreadPool();
     private TextView mTitle;
     private TextView mSubtitle1;
     private TextView mSubtitle2;
@@ -55,39 +60,42 @@
                                       CharSequence actionLabel,
                                       boolean shouldShowExploreButton,
                                       OnClickListener exploreButtonClickListener) {
-        final List<String> attributions = wallpaperInfo.getAttributions(getContext());
+        sExecutorService.execute(() -> {
+            final List<String> attributions = wallpaperInfo.getAttributions(getContext());
+            new Handler(Looper.getMainLooper()).post(() -> {
+                // Reset wallpaper information UI
+                mTitle.setText(null);
+                mSubtitle1.setText(null);
+                mSubtitle1.setVisibility(View.GONE);
+                mSubtitle2.setText(null);
+                mSubtitle2.setVisibility(View.GONE);
+                mExploreButton.setText(null);
+                mExploreButton.setOnClickListener(null);
+                mExploreButton.setVisibility(View.GONE);
 
-        // Reset
-        mTitle.setText(null);
-        mSubtitle1.setText(null);
-        mSubtitle1.setVisibility(View.GONE);
-        mSubtitle2.setText(null);
-        mSubtitle2.setVisibility(View.GONE);
-        mExploreButton.setText(null);
-        mExploreButton.setOnClickListener(null);
-        mExploreButton.setVisibility(View.GONE);
+                if (attributions.size() > 0 && attributions.get(0) != null) {
+                    mTitle.setText(attributions.get(0));
+                }
 
-        if (attributions.size() > 0 && attributions.get(0) != null) {
-            mTitle.setText(attributions.get(0));
-        }
+                if (shouldShowMetadata(wallpaperInfo)) {
+                    if (attributions.size() > 1 && attributions.get(1) != null) {
+                        mSubtitle1.setVisibility(View.VISIBLE);
+                        mSubtitle1.setText(attributions.get(1));
+                    }
 
-        if (shouldShowMetadata(wallpaperInfo)) {
-            if (attributions.size() > 1 && attributions.get(1) != null) {
-                mSubtitle1.setVisibility(View.VISIBLE);
-                mSubtitle1.setText(attributions.get(1));
-            }
+                    if (attributions.size() > 2 && attributions.get(2) != null) {
+                        mSubtitle2.setVisibility(View.VISIBLE);
+                        mSubtitle2.setText(attributions.get(2));
+                    }
 
-            if (attributions.size() > 2 && attributions.get(2) != null) {
-                mSubtitle2.setVisibility(View.VISIBLE);
-                mSubtitle2.setText(attributions.get(2));
-            }
-
-            if (shouldShowExploreButton) {
-                mExploreButton.setVisibility(View.VISIBLE);
-                mExploreButton.setText(actionLabel);
-                mExploreButton.setOnClickListener(exploreButtonClickListener);
-            }
-        }
+                    if (shouldShowExploreButton) {
+                        mExploreButton.setVisibility(View.VISIBLE);
+                        mExploreButton.setText(actionLabel);
+                        mExploreButton.setOnClickListener(exploreButtonClickListener);
+                    }
+                }
+            });
+        });
     }
 
     private boolean shouldShowMetadata(WallpaperInfo wallpaperInfo) {