commit 7cdf920187dc34f0b710fa07319456eb0c137b09
author Ben Lin <linben@google.com> Mon Sep 14 16:55:04 2020 -0700
committer Ben Lin <linben@google.com> Wed Sep 23 15:47:41 2020 +0000
tree 36b522073011fb499295f1ea5cc5eb3eba5a1732
parent 0d6e0d8e360ce10c310fb0d0366d442ded571183

Check for null when getting PiP action item drawables.

Upon loading the action item drawables, it's possible they end up
returned as null.

Bug: 167338598
Test: None
Merged-In: Iff2b7d499cee275294075a37a4970dc2dbc97401
Change-Id: Iff2b7d499cee275294075a37a4970dc2dbc97401
(cherry picked from commit e09e8e8a182a9795dbbad78c41e1aea2be387425)

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

diff --git a/packages/SystemUI/src/com/android/systemui/pip/phone/PipMenuActivity.java b/packages/SystemUI/src/com/android/systemui/pip/phone/PipMenuActivity.java
index 2a83aa0..586399c 100644
--- a/packages/SystemUI/src/com/android/systemui/pip/phone/PipMenuActivity.java
+++ b/packages/SystemUI/src/com/android/systemui/pip/phone/PipMenuActivity.java
@@ -562,8 +562,10 @@
 
                     // 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()) {