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

Commit 1c472e50 authored by Julia Tuttle's avatar Julia Tuttle
Browse files

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 827d9671)
parent 43be2221

core/java/android/widget/RemoteViews.java

+7 −1
Original line number Diff line number Diff line
@@ -6681,7 +6681,13 @@ public class RemoteViews implements Parcelable, Filter { 
                opts = ActivityOptions.makeBasic();

                opts.setPendingIntentLaunchFlags(Intent.FLAG_ACTIVITY_NEW_TASK);

            }

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

        }

    }