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

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

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

Change-Id: I9bbccd3a3be6673845de8d164e8087dac8e299af
This commit is contained in:
TreeHugger Robot
2022-03-04 22:01:35 +00:00
committed by Automerger Merge Worker
parent 2336bfdcfa a5ab5d5836
commit cc63305a57
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/widget/RemoteViews.java
View File

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