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

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

Merge "Prevent NPE when checking toast icon label"

parents cf8a6227 aeacd49f

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

+3 −1
Original line number Diff line number Diff line
@@ -199,7 +199,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,