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

Merge "Check for null when getting PiP action item drawables." into rvc-qpr-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2020-09-25 18:07:51 +00:00
committed by Android (Google) Code Review
parent f7741b10f3 7cdf920187
commit 369ecdd88c
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/SystemUI/src/com/android/systemui/pip/phone/PipMenuActivity.java
View File

@@ -562,8 +562,10 @@ public class PipMenuActivity extends Activity {
// TODO: Check if the action drawable has changed before we reload it
action.getIcon().loadDrawableAsync(this, d -> {
d.setTint(Color.WHITE);
actionView.setImageDrawable(d);
if (d != null) {
d.setTint(Color.WHITE);
actionView.setImageDrawable(d);
}
}, mHandler);
actionView.setContentDescription(action.getContentDescription());
if (action.isEnabled()) {