Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dcd3e8b4 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12664466

Change-Id: If086dd6b8fc453cd8a798c5aff97c0c854eabec9
parents 97c1d214 369ecdd8

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

+4 −2
Original line number Diff line number Diff line
@@ -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 -> {

                        if (d != null) {

                            d.setTint(Color.WHITE);

                            actionView.setImageDrawable(d);

                        }

                    }, mHandler);

                    actionView.setContentDescription(action.getContentDescription());

                    if (action.isEnabled()) {