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

Commit a42f760f authored by Miranda Kephart's avatar Miranda Kephart
Browse files

Add null check when checking clipboard actions package 

If a RemoteAction returned through TextClassifier does not have
a ComponentName set, it will cause an NPE. This change adds a
null check to forestall that (and just doesn't show a chip if
there's no ComponentName).

Bug: 218458652
Test: manual (force-set component to null and checked that error
occurred before but not after fix)

Change-Id: Ia17e2375f8a31b44de51e3cfb0dafc8c1dff1ad2
parent c647b490

packages/SystemUI/src/com/android/systemui/clipboardoverlay/ClipboardOverlayController.java

+2 −1
Original line number Diff line number Diff line
@@ -252,7 +252,8 @@ public class ClipboardOverlayController { 
            resetActionChips();

            for (RemoteAction action : actions) {

                Intent targetIntent = action.getActionIntent().getIntent();

                if (!TextUtils.equals(source, targetIntent.getComponent().getPackageName())) {

                ComponentName component = targetIntent.getComponent();

                if (component != null && !TextUtils.equals(source, component.getPackageName())) {

                    OverlayActionChip chip = constructActionChip(action);

                    mActionContainer.addView(chip);

                    mActionChips.add(chip);