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

Commit a7c80fad authored by Wu Ahan's avatar Wu Ahan Committed by Automerger Merge Worker
Browse files

Merge "Add null check before notifying CUJ events" into sc-v2-dev am: 60316d32 am: 12b1a2ef 

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

Change-Id: I545d7f82708ae23f89f93284066290201af28367
parents 2f423bd5 12b1a2ef

core/java/com/android/internal/jank/InteractionJankMonitor.java

+9 −2
Original line number Diff line number Diff line
@@ -377,7 +377,13 @@ public class InteractionJankMonitor { 


        // Notify the receivers if necessary.

        if (session.shouldNotify()) {

            if (context != null) {

                notifyEvents(context, action, session);

            } else {

                throw new IllegalArgumentException(

                        "Can't notify cuj events due to lack of context: cuj="

                        + session.getName() + ", action=" + action);

            }

        }

    }
@@ -739,7 +745,8 @@ public class InteractionJankMonitor { 
             * @return builder

             */

            public static Builder withView(@CujType int cuj, @NonNull View view) {

                return new Builder(cuj).setView(view);

                return new Builder(cuj).setView(view)

                        .setContext(view.getContext());

            }



            private Builder(@CujType int cuj) {