Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I406eee540d6fa8e36f5975ef39ee8228e47e2322
This commit is contained in:
Wu Ahan
2021-11-13 04:50:51 +00:00
committed by Automerger Merge Worker
parent 3740f52ea4 60316d327f
commit 12b1a2ef2e
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/java/com/android/internal/jank/InteractionJankMonitor.java
View File

@@ -377,7 +377,13 @@ public class InteractionJankMonitor {
// Notify the receivers if necessary. // Notify the receivers if necessary.
if (session.shouldNotify()) { 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 @@ public class InteractionJankMonitor {
* @return builder * @return builder
*/ */
public static Builder withView(@CujType int cuj, @NonNull View view) { 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) { private Builder(@CujType int cuj) {