Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[ANR] Read device icon on the main thread" into sc-dev

Browse Source
This commit is contained in:
Lucas Dupin
2021-05-14 15:08:58 +00:00
committed by Android (Google) Code Review
parent ff15f21812 8ffe58d794
commit 1ecac1ab60
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputBaseAdapter.java
View File

@@ -24,6 +24,7 @@ import android.graphics.PorterDuff;
import android.graphics.PorterDuffColorFilter; import android.graphics.PorterDuffColorFilter;
import android.graphics.Typeface; import android.graphics.Typeface;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.graphics.drawable.Icon;
import android.text.TextUtils; import android.text.TextUtils;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
@@ -41,6 +42,7 @@ import androidx.recyclerview.widget.RecyclerView;
import com.android.settingslib.bluetooth.BluetoothUtils; import com.android.settingslib.bluetooth.BluetoothUtils;
import com.android.settingslib.media.MediaDevice; import com.android.settingslib.media.MediaDevice;
import com.android.settingslib.utils.ThreadUtils;
import com.android.systemui.R; import com.android.systemui.R;
import com.android.systemui.animation.Interpolators; import com.android.systemui.animation.Interpolators;
@@ -116,6 +118,7 @@ public abstract class MediaOutputBaseAdapter extends
final View mDivider; final View mDivider;
final View mBottomDivider; final View mBottomDivider;
final CheckBox mCheckBox; final CheckBox mCheckBox;
private String mDeviceId;
MediaDeviceBaseViewHolder(View view) { MediaDeviceBaseViewHolder(View view) {
super(view); super(view);
@@ -134,8 +137,17 @@ public abstract class MediaOutputBaseAdapter extends
} }
void onBind(MediaDevice device, boolean topMargin, boolean bottomMargin) { void onBind(MediaDevice device, boolean topMargin, boolean bottomMargin) {
mTitleIcon.setImageIcon(mController.getDeviceIconCompat(device).toIcon(mContext)); mDeviceId = device.getId();
ThreadUtils.postOnBackgroundThread(() -> {
Icon icon = mController.getDeviceIconCompat(device).toIcon(mContext);
ThreadUtils.postOnMainThread(() -> {
if (!TextUtils.equals(mDeviceId, device.getId())) {
return;
}
mTitleIcon.setImageIcon(icon);
setMargin(topMargin, bottomMargin); setMargin(topMargin, bottomMargin);
});
});
} }
void onBind(int customizedItem, boolean topMargin, boolean bottomMargin) { void onBind(int customizedItem, boolean topMargin, boolean bottomMargin) {