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

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

Merge "Fix NPE" into rvc-dev am: 880c4ce9 am: 1bf69e64 am: cd567188 am: 572bc072 

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

Change-Id: I6818d49716a4ca0982947d3df16e83068c6702dd
parents f029b7c4 572bc072

packages/SystemUI/src/com/android/systemui/bubbles/BubbleOverflowActivity.java

+4 −1
Original line number Diff line number Diff line
@@ -285,7 +285,10 @@ class BubbleOverflowAdapter extends RecyclerView.Adapter<BubbleOverflowAdapter.V 
                    }

                });



        ShortcutInfo info = b.getEntry().getRanking().getShortcutInfo();

        // If the bubble was persisted, the entry is null but it should have shortcut info

        ShortcutInfo info = b.getEntry() == null

                ? b.getShortcutInfo()

                : b.getEntry().getRanking().getShortcutInfo();

        if (info == null) {

            Log.d(TAG, "ShortcutInfo required to bubble but none found for " + b);

        } else {