Commit 11f96149 authored by Jinsuk Kim's avatar Jinsuk Kim Committed by Commit Bot

Android: Fix a crash upon PIP mode exit

This CL caches the activity tab that PIP mode got turned on with,
to use it when leaving PIP mode. In this way, the reported NPE
can be avoided when the activity tab is not available at the time
callback needs to be invoked.

Bug: 1119340
Change-Id: I5d422b4d41961a09cc8c6c1f18ca89edf50d8eed
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2371768Reviewed-by: default avatarPeter Conn <peconn@chromium.org>
Reviewed-by: default avatarMounir Lamouri <mlamouri@chromium.org>
Commit-Queue: Jinsuk Kim <jinsukkim@chromium.org>
Cr-Commit-Position: refs/heads/master@{#806509}
parent 2e384a5d
......@@ -200,17 +200,17 @@ public class PictureInPictureController {
// We don't want InfoBars displaying while in PiP, they cover too much content.
InfoBarContainer.get(activity.getActivityTab()).setHidden(true);
// Setup observers to dismiss the Activity on events that should end PiP.
final Tab activityTab = activity.getActivityTab();
mOnLeavePipCallbacks.add(new Callback<ChromeActivity>() {
@Override
public void onResult(ChromeActivity activity2) {
webContents.setHasPersistentVideo(false);
InfoBarContainer.get(activity.getActivityTab()).setHidden(false);
InfoBarContainer.get(activityTab).setHidden(false);
}
});
// Setup observers to dismiss the Activity on events that should end PiP.
final Tab activityTab = activity.getActivityTab();
final TabObserver tabObserver = new DismissActivityOnTabEventObserver(activity);
final TabModelSelectorObserver tabModelSelectorObserver =
new DismissActivityOnTabModelSelectorEventObserver(activity);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment