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); } }