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

Commit 8db70a36 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Prevent NPE when checking toast icon label" into sc-v2-dev

parents b92bc421 d30f4c67

packages/SystemUI/src/com/android/systemui/toast/SystemUIToast.java

+3 −1
Original line number Diff line number Diff line
@@ -200,7 +200,9 @@ public class SystemUIToast implements ToastPlugin.Toast { 
                iconView.setVisibility(View.GONE);

            } else {

                iconView.setImageDrawable(icon);

                if (appInfo.labelRes != 0) {

                if (appInfo == null) {

                    Log.d(TAG, "No appInfo for pkg=" + mPackageName + " usr=" + mUserId);

                } else if (appInfo.labelRes != 0) {

                    try {

                        Resources res = mContext.getPackageManager().getResourcesForApplication(

                                appInfo,