From 1c472e50c971462b7941e844a3317a8772b6ed2b Mon Sep 17 00:00:00 2001 From: Julia Tuttle Date: Fri, 25 Feb 2022 16:17:16 -0500 Subject: [PATCH] RemoteViews: don't crash on null display in getLaunchOptions While we investigate the root cause of this bug, turn the crash into a warning. Bug: 218409359 Test: none; we don't have repro steps for the bug yet Change-Id: I6d699ea839726adc634a200a0057e316d59ecaa9 (cherry picked from commit 827d967199e89609c837c5a81f76a5067ed6d3f5) --- core/java/android/widget/RemoteViews.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/core/java/android/widget/RemoteViews.java b/core/java/android/widget/RemoteViews.java index b00a3829f4682..fbad38f27a23b 100644 --- a/core/java/android/widget/RemoteViews.java +++ b/core/java/android/widget/RemoteViews.java @@ -6681,7 +6681,13 @@ public class RemoteViews implements Parcelable, Filter { opts = ActivityOptions.makeBasic(); opts.setPendingIntentLaunchFlags(Intent.FLAG_ACTIVITY_NEW_TASK); } - opts.setLaunchDisplayId(view.getDisplay().getDisplayId()); + if (view.getDisplay() != null) { + opts.setLaunchDisplayId(view.getDisplay().getDisplayId()); + } else { + // TODO(b/218409359): Remove once bug is fixed. + Log.w(LOG_TAG, "getLaunchOptions: view.getDisplay() is null!", + new Exception()); + } return Pair.create(intent, opts); } }