commit a7c80fad92596aacbf8bbf4ac97455dc1e5d7a3b
author Wu Ahan <ahanwu@google.com> Sat Nov 13 05:02:25 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat Nov 13 05:02:25 2021 +0000
tree 08957ae2978ebeffd3959595373631c78ffb6566
parent 2f423bd54d24d4d85b5140955ffdeaffbd0ec58e
parent 12b1a2ef2e6c8f9a4a4e89501f1c90b629fee8ea

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

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

Change-Id: I545d7f82708ae23f89f93284066290201af28367

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

diff --git a/core/java/com/android/internal/jank/InteractionJankMonitor.java b/core/java/com/android/internal/jank/InteractionJankMonitor.java
index 0ba5a39..ea38db3 100644
--- a/core/java/com/android/internal/jank/InteractionJankMonitor.java
+++ b/core/java/com/android/internal/jank/InteractionJankMonitor.java
@@ -377,7 +377,13 @@
 
         // Notify the receivers if necessary.
         if (session.shouldNotify()) {
-            notifyEvents(context, action, session);
+            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 @@
              * @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) {