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

Commit cc63305a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "RemoteViews: don't crash on null display in getLaunchOptions" into tm-dev am: a5ab5d58 

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

Change-Id: I9bbccd3a3be6673845de8d164e8087dac8e299af
parents 2336bfdc a5ab5d58

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

        }

    }