Commit 73b2804d authored by Andrew Grieve's avatar Andrew Grieve Committed by Commit Bot

Android: Fix crash when showing downloads with no active activity

Recent regression from 1796079a

Bug: 827844
Change-Id: Ia29d752c0144d60e5e0fe74d6170671412375f0d
Reviewed-on: https://chromium-review.googlesource.com/991409Reviewed-by: default avatarJoy Ming <jming@chromium.org>
Commit-Queue: agrieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#547775}
parent 18d8eec1
......@@ -137,14 +137,19 @@ public class DownloadUtils {
@Nullable Activity activity, @Nullable Tab tab, boolean showPrefetchedContent) {
// Figure out what tab was last being viewed by the user.
if (activity == null) activity = ApplicationStatus.getLastTrackedFocusedActivity();
Context appContext = ContextUtils.getApplicationContext();
boolean isTablet;
if (tab == null && activity instanceof ChromeTabbedActivity) {
tab = ((ChromeTabbedActivity) activity).getActivityTab();
ChromeTabbedActivity chromeActivity = ((ChromeTabbedActivity) activity);
tab = chromeActivity.getActivityTab();
isTablet = chromeActivity.isTablet();
} else {
Context displayContext = activity != null ? activity : appContext;
isTablet = DeviceFormFactor.isNonMultiDisplayContextOnTablet(displayContext);
}
Context appContext = ContextUtils.getApplicationContext();
if (DeviceFormFactor.isNonMultiDisplayContextOnTablet(activity)) {
if (isTablet) {
// Download Home shows up as a tab on tablets.
LoadUrlParams params = new LoadUrlParams(UrlConstants.DOWNLOADS_URL);
if (tab == null || !tab.isInitialized()) {
......
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