#839 fix crash in startup

uazo · Mar 1, 2024 · 7c79ae4 · 7c79ae4
1 parent 8998e3d
commit 7c79ae4
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/build/patches/Show-NTP-at-startup.patch b/build/patches/Show-NTP-at-startup.patch
@@ -12,13 +12,13 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
  .../tasks/SingleTabSwitcherOnNtpMediator.java       |  8 ++++----
  .../android/java/res/xml/homepage_preferences.xml   |  6 ++++++
  .../chrome/browser/ChromeInactivityTracker.java     | 13 +++++++++++++
- .../chrome/browser/ChromeTabbedActivity.java        |  2 ++
+ .../chrome/browser/ChromeTabbedActivity.java        |  4 +++-
  .../chrome/browser/tasks/ReturnToChromeUtil.java    |  6 ++++++
  .../browser/preferences/ChromePreferenceKeys.java   |  2 ++
  .../preferences/LegacyChromePreferenceKeys.java     |  1 +
  .../show-ntp-at-startup.grdp                        |  9 +++++++++
  .../chrome_feature_list_cc/show-ntp-at-startup.inc  |  2 ++
- 10 files changed, 54 insertions(+), 6 deletions(-)
+ 10 files changed, 55 insertions(+), 7 deletions(-)
  create mode 100644 chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/show-ntp-at-startup.grdp
  create mode 100644 cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/show-ntp-at-startup.inc
 
@@ -128,6 +128,15 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeInactivit
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
+@@ -1618,7 +1618,7 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
+                 Callback<String> onStandardActiveIndexRead = null;
+                 shouldShowNtpAsHomeSurfaceAtStartup = shouldShowNtpHomeSurfaceOnStartup();
+                 boolean skipSavingNonActiveNtps = skipSavingNonActiveNtps();
+-                if (skipSavingNonActiveNtps) {
++                if (skipSavingNonActiveNtps || shouldShowNtpAsHomeSurfaceAtStartup) {
+                     mHomeSurfaceTracker = new HomeSurfaceTracker();
+                 }
+                 if (shouldShowNtpAsHomeSurfaceAtStartup) {
 @@ -2269,6 +2269,8 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
          mInactivityTracker =
                  new ChromeInactivityTracker(