Fix crash on first run on Android

brave · Oct 22, 2024 · 97e2174 · 97e2174
1 parent 35694b8
commit 97e2174
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/browser/about_flags.cc b/browser/about_flags.cc
@@ -300,9 +300,18 @@
       kOsAndroid,                                                             \
       FEATURE_VALUE_TYPE(safe_browsing::features::kBraveAndroidSafeBrowsing), \
   })
+#define BRAVE_DAY_ZERO_EXPERIMENT                            \
+  EXPAND_FEATURE_ENTRIES({                                   \
+      "brave-day-zero-experiment",                           \
+      "Day Zero Experiment",                                 \
+      "Enables the Day Zero Experiment",                     \
+      kOsAndroid,                                            \
+      FEATURE_VALUE_TYPE(features::kBraveDayZeroExperiment), \
+  })
 #else
 #define BRAVE_BACKGROUND_VIDEO_PLAYBACK_ANDROID
 #define BRAVE_SAFE_BROWSING_ANDROID
+#define BRAVE_DAY_ZERO_EXPERIMENT
 #endif  // BUILDFLAG(IS_ANDROID)
 
 #if !BUILDFLAG(IS_ANDROID)
@@ -969,6 +978,7 @@
   PLAYLIST_FEATURE_ENTRIES                                                     \
   BRAVE_COMMANDS_FEATURE_ENTRIES                                               \
   BRAVE_BACKGROUND_VIDEO_PLAYBACK_ANDROID                                      \
+  BRAVE_DAY_ZERO_EXPERIMENT                                                    \
   BRAVE_SAFE_BROWSING_ANDROID                                                  \
   BRAVE_CHANGE_ACTIVE_TAB_ON_SCROLL_EVENT_FEATURE_ENTRIES                      \
   BRAVE_TABS_FEATURE_ENTRIES                                                   \

diff --git a/chromium_src/chrome/browser/flags/android/chrome_feature_list.cc b/chromium_src/chrome/browser/flags/android/chrome_feature_list.cc
@@ -8,6 +8,7 @@
 #include "brave/browser/android/first_run/features.h"
 #include "brave/browser/android/preferences/features.h"
 #include "brave/browser/android/safe_browsing/features.h"
+#include "brave/browser/brave_browser_features.h"
 #include "brave/components/ai_chat/core/common/buildflags/buildflags.h"
 #include "brave/components/brave_news/common/features.h"
 #include "brave/components/brave_rewards/common/features.h"
@@ -51,7 +52,8 @@
     &google_sign_in_permission::features::kBraveGoogleSignInPermission, \
     &net::features::kBraveForgetFirstPartyStorage,                      \
     &brave_shields::features::kBraveShowStrictFingerprintingMode,       \
-    &brave_shields::features::kBraveLocalhostAccessPermission
+    &brave_shields::features::kBraveLocalhostAccessPermission,          \
+    &features::kBraveDayZeroExperiment
 
 // clang-format on