From 58e6734aca768bafdc74cd2de1735c3bc61d2ef8 Mon Sep 17 00:00:00 2001 From: Artem Samoilenko Date: Thu, 24 Apr 2025 11:18:08 -0400 Subject: [PATCH] [cr137] [Android] Fixes for NullAway presubmit errors Chromium change: https://chromium.googlesource.com/chromium/src/+/8bafbc5401239117b080d98f49e7bab83eed0e38 Turn NullAway presubmit upload check into an error instead of warning Bug: 412696018 --- .../app/appmenu/BraveAppMenuPropertiesDelegateImpl.java | 2 ++ .../appmenu/BraveTabbedAppMenuPropertiesDelegate.java | 2 ++ .../chrome/browser/crypto_wallet/util/AndroidUtils.java | 2 ++ .../browser/multiwindow/BraveMultiInstanceManagerApi31.java | 2 ++ .../chrome/browser/multiwindow/BraveMultiWindowUtils.java | 2 ++ .../org/chromium/chrome/browser/ntp/BraveNewTabPage.java | 2 ++ .../chrome/browser/omnibox/BraveLocationBarCoordinator.java | 2 ++ .../chrome/browser/omnibox/BraveLocationBarMediator.java | 2 ++ .../omnibox/suggestions/BraveAutocompleteMediator.java | 2 ++ .../browser/privacy/settings/BravePrivacySettings.java | 2 ++ .../chromium/chrome/browser/rewards/BraveRewardsPanel.java | 2 ++ .../browser/rewards/onboarding/RewardsOnboarding.java | 6 +++--- .../rewards/tipping/RewardsTippingPanelFragment.java | 2 ++ .../rewards/tipping/TippingVerifiedCreatorToolTip.java | 2 ++ .../chrome/browser/settings/BraveMainPreferencesBase.java | 2 ++ .../chrome/browser/settings/BraveWalletPreferences.java | 2 ++ .../chrome/browser/share/BraveShareDelegateImpl.java | 2 ++ .../chrome/browser/shields/CreateCustomFiltersFragment.java | 2 ++ .../browser/ui/system/BraveStatusBarColorController.java | 2 ++ .../chrome/browser/vpn/adapters/AlwaysOnPagerAdapter.java | 2 ++ .../components/permissions/BravePermissionDialogModel.java | 2 ++ 21 files changed, 43 insertions(+), 3 deletions(-) diff --git a/android/java/org/chromium/chrome/browser/app/appmenu/BraveAppMenuPropertiesDelegateImpl.java b/android/java/org/chromium/chrome/browser/app/appmenu/BraveAppMenuPropertiesDelegateImpl.java index 3a96b9a9004..d7218ca1fdc 100644 --- a/android/java/org/chromium/chrome/browser/app/appmenu/BraveAppMenuPropertiesDelegateImpl.java +++ b/android/java/org/chromium/chrome/browser/app/appmenu/BraveAppMenuPropertiesDelegateImpl.java @@ -13,6 +13,7 @@ import androidx.annotation.Nullable; import org.chromium.base.supplier.ObservableSupplier; import org.chromium.base.supplier.OneshotSupplier; import org.chromium.base.supplier.Supplier; +import org.chromium.build.annotations.NullMarked; import org.chromium.chrome.R; import org.chromium.chrome.browser.ActivityTabProvider; import org.chromium.chrome.browser.bookmarks.BookmarkModel; @@ -27,6 +28,7 @@ import org.chromium.chrome.browser.ui.appmenu.AppMenuItemProperties; import org.chromium.ui.modelutil.MVCListAdapter; import org.chromium.ui.modelutil.MVCListAdapter.ModelList; +@NullMarked public abstract class BraveAppMenuPropertiesDelegateImpl extends AppMenuPropertiesDelegateImpl { public BraveAppMenuPropertiesDelegateImpl( Context context, diff --git a/android/java/org/chromium/chrome/browser/appmenu/BraveTabbedAppMenuPropertiesDelegate.java b/android/java/org/chromium/chrome/browser/appmenu/BraveTabbedAppMenuPropertiesDelegate.java index 3909a70e297..04f94e2ddc8 100644 --- a/android/java/org/chromium/chrome/browser/appmenu/BraveTabbedAppMenuPropertiesDelegate.java +++ b/android/java/org/chromium/chrome/browser/appmenu/BraveTabbedAppMenuPropertiesDelegate.java @@ -25,6 +25,7 @@ import org.chromium.base.supplier.ObservableSupplier; import org.chromium.base.supplier.OneshotSupplier; import org.chromium.base.supplier.Supplier; import org.chromium.brave_vpn.mojom.BraveVpnConstants; +import org.chromium.build.annotations.NullMarked; import org.chromium.chrome.R; import org.chromium.chrome.browser.ActivityTabProvider; import org.chromium.chrome.browser.BraveRewardsNativeWorker; @@ -61,6 +62,7 @@ import org.chromium.components.user_prefs.UserPrefs; import org.chromium.ui.modaldialog.ModalDialogManager; /** Brave's extension for TabbedAppMenuPropertiesDelegate */ +@NullMarked public class BraveTabbedAppMenuPropertiesDelegate extends TabbedAppMenuPropertiesDelegate { private Menu mMenu; private AppMenuDelegate mAppMenuDelegate; diff --git a/android/java/org/chromium/chrome/browser/crypto_wallet/util/AndroidUtils.java b/android/java/org/chromium/chrome/browser/crypto_wallet/util/AndroidUtils.java index 45616ab1ea4..53c785399ec 100644 --- a/android/java/org/chromium/chrome/browser/crypto_wallet/util/AndroidUtils.java +++ b/android/java/org/chromium/chrome/browser/crypto_wallet/util/AndroidUtils.java @@ -22,9 +22,11 @@ import androidx.fragment.app.Fragment; import org.chromium.base.Callback; import org.chromium.base.ContextUtils; +import org.chromium.build.annotations.NullMarked; import org.chromium.chrome.R; import org.chromium.ui.text.ChromeClickableSpan; +@NullMarked public class AndroidUtils { public static int getToolBarHeight(Context context) { TypedValue tv = new TypedValue(); diff --git a/android/java/org/chromium/chrome/browser/multiwindow/BraveMultiInstanceManagerApi31.java b/android/java/org/chromium/chrome/browser/multiwindow/BraveMultiInstanceManagerApi31.java index 36df9991903..0b02eb46e17 100644 --- a/android/java/org/chromium/chrome/browser/multiwindow/BraveMultiInstanceManagerApi31.java +++ b/android/java/org/chromium/chrome/browser/multiwindow/BraveMultiInstanceManagerApi31.java @@ -9,6 +9,7 @@ import android.app.Activity; import org.chromium.base.supplier.ObservableSupplier; import org.chromium.base.supplier.Supplier; +import org.chromium.build.annotations.NullMarked; import org.chromium.chrome.R; import org.chromium.chrome.browser.app.tabmodel.TabModelOrchestrator; import org.chromium.chrome.browser.app.tabwindow.TabWindowManagerSingleton; @@ -23,6 +24,7 @@ import org.chromium.components.browser_ui.desktop_windowing.DesktopWindowStateMa import org.chromium.components.browser_ui.widget.MenuOrKeyboardActionController; import org.chromium.ui.modaldialog.ModalDialogManager; +@NullMarked class BraveMultiInstanceManagerApi31 extends MultiInstanceManagerApi31 { private static final String TAG = "MultiInstanceApi31"; diff --git a/android/java/org/chromium/chrome/browser/multiwindow/BraveMultiWindowUtils.java b/android/java/org/chromium/chrome/browser/multiwindow/BraveMultiWindowUtils.java index 25c0a97763a..30b94fddd72 100644 --- a/android/java/org/chromium/chrome/browser/multiwindow/BraveMultiWindowUtils.java +++ b/android/java/org/chromium/chrome/browser/multiwindow/BraveMultiWindowUtils.java @@ -10,6 +10,7 @@ import android.content.Intent; import org.chromium.base.BravePreferenceKeys; import org.chromium.base.Log; +import org.chromium.build.annotations.NullMarked; import org.chromium.chrome.browser.ChromeTabbedActivity; import org.chromium.chrome.browser.app.BraveActivity; import org.chromium.chrome.browser.preferences.ChromeSharedPreferences; @@ -17,6 +18,7 @@ import org.chromium.chrome.browser.tabmodel.TabModelSelector; import java.util.List; +@NullMarked public class BraveMultiWindowUtils extends MultiWindowUtils { private static final String TAG = "MultiWindowUtils"; diff --git a/android/java/org/chromium/chrome/browser/ntp/BraveNewTabPage.java b/android/java/org/chromium/chrome/browser/ntp/BraveNewTabPage.java index 066c14ae288..73d140ae6a2 100644 --- a/android/java/org/chromium/chrome/browser/ntp/BraveNewTabPage.java +++ b/android/java/org/chromium/chrome/browser/ntp/BraveNewTabPage.java @@ -12,6 +12,7 @@ import org.chromium.base.jank_tracker.JankTracker; import org.chromium.base.supplier.ObservableSupplier; import org.chromium.base.supplier.OneshotSupplier; import org.chromium.base.supplier.Supplier; +import org.chromium.build.annotations.NullMarked; import org.chromium.chrome.R; import org.chromium.chrome.browser.browser_controls.BrowserControlsStateProvider; import org.chromium.chrome.browser.feed.BraveFeedSurfaceCoordinator; @@ -39,6 +40,7 @@ import org.chromium.components.browser_ui.bottomsheet.BottomSheetController; import org.chromium.components.search_engines.TemplateUrlService; import org.chromium.ui.base.WindowAndroid; +@NullMarked public class BraveNewTabPage extends NewTabPage { private JankTracker mJankTracker; diff --git a/android/java/org/chromium/chrome/browser/omnibox/BraveLocationBarCoordinator.java b/android/java/org/chromium/chrome/browser/omnibox/BraveLocationBarCoordinator.java index 4deb6848cd6..5c3671eeefe 100644 --- a/android/java/org/chromium/chrome/browser/omnibox/BraveLocationBarCoordinator.java +++ b/android/java/org/chromium/chrome/browser/omnibox/BraveLocationBarCoordinator.java @@ -15,6 +15,7 @@ import androidx.annotation.Nullable; import org.chromium.base.Callback; import org.chromium.base.supplier.ObservableSupplier; import org.chromium.base.supplier.Supplier; +import org.chromium.build.annotations.NullMarked; import org.chromium.chrome.browser.back_press.BackPressManager; import org.chromium.chrome.browser.browser_controls.BrowserControlsStateProvider; import org.chromium.chrome.browser.browser_controls.BrowserStateBrowserControlsVisibilityDelegate; @@ -39,6 +40,7 @@ import org.chromium.ui.modaldialog.ModalDialogManager; import java.util.function.BooleanSupplier; +@NullMarked public class BraveLocationBarCoordinator extends LocationBarCoordinator { /** * {@link LocationBarCoordinator#mLocationBarMediator} is private so we add a private diff --git a/android/java/org/chromium/chrome/browser/omnibox/BraveLocationBarMediator.java b/android/java/org/chromium/chrome/browser/omnibox/BraveLocationBarMediator.java index f5ea63ed605..6b30bd8de4e 100644 --- a/android/java/org/chromium/chrome/browser/omnibox/BraveLocationBarMediator.java +++ b/android/java/org/chromium/chrome/browser/omnibox/BraveLocationBarMediator.java @@ -17,6 +17,7 @@ import androidx.appcompat.app.AppCompatActivity; import org.chromium.base.supplier.ObservableSupplier; import org.chromium.base.supplier.OneshotSupplier; +import org.chromium.build.annotations.NullMarked; import org.chromium.chrome.browser.browser_controls.BrowserControlsStateProvider; import org.chromium.chrome.browser.lens.LensController; import org.chromium.chrome.browser.locale.LocaleManager; @@ -30,6 +31,7 @@ import org.chromium.ui.permissions.PermissionCallback; import java.util.function.BooleanSupplier; +@NullMarked public class BraveLocationBarMediator extends LocationBarMediator { private WindowAndroid mWindowAndroid; private LocationBarLayout mLocationBarLayout; diff --git a/android/java/org/chromium/chrome/browser/omnibox/suggestions/BraveAutocompleteMediator.java b/android/java/org/chromium/chrome/browser/omnibox/suggestions/BraveAutocompleteMediator.java index 9e1de7f39bc..65969e39998 100644 --- a/android/java/org/chromium/chrome/browser/omnibox/suggestions/BraveAutocompleteMediator.java +++ b/android/java/org/chromium/chrome/browser/omnibox/suggestions/BraveAutocompleteMediator.java @@ -13,6 +13,7 @@ import androidx.annotation.Nullable; import org.chromium.base.Callback; import org.chromium.base.supplier.Supplier; +import org.chromium.build.annotations.NullMarked; import org.chromium.chrome.browser.brave_leo.BraveLeoPrefUtils; import org.chromium.chrome.browser.brave_leo.BraveLeoUtils; import org.chromium.chrome.browser.lifecycle.ActivityLifecycleDispatcher; @@ -37,6 +38,7 @@ import org.chromium.ui.modelutil.PropertyModel; import java.util.List; import java.util.Locale; +@NullMarked class BraveAutocompleteMediator extends AutocompleteMediator implements BraveSuggestionHost, BraveLeoAutocompleteDelegate { private static final String AUTOCOMPLETE_ENABLED = "brave.autocomplete_enabled"; diff --git a/android/java/org/chromium/chrome/browser/privacy/settings/BravePrivacySettings.java b/android/java/org/chromium/chrome/browser/privacy/settings/BravePrivacySettings.java index f93a99d9353..77b5007c96e 100644 --- a/android/java/org/chromium/chrome/browser/privacy/settings/BravePrivacySettings.java +++ b/android/java/org/chromium/chrome/browser/privacy/settings/BravePrivacySettings.java @@ -18,6 +18,7 @@ import org.chromium.base.BravePreferenceKeys; import org.chromium.base.ContextUtils; import org.chromium.brave_shields.mojom.FilterListAndroidHandler; import org.chromium.brave_shields.mojom.FilterListConstants; +import org.chromium.build.annotations.NullMarked; import org.chromium.chrome.R; import org.chromium.chrome.browser.BraveConfig; import org.chromium.chrome.browser.BraveFeatureUtil; @@ -53,6 +54,7 @@ import org.chromium.ui.text.SpanApplier; import org.chromium.webcompat_reporter.mojom.WebcompatReporterHandler; /** Fragment to keep track of the all the brave privacy related preferences. */ +@NullMarked public class BravePrivacySettings extends PrivacySettings implements ConnectionErrorHandler { private static final String BLOCK_ALL_COOKIES_LEARN_MORE_LINK = "https://github.com/brave/brave-browser/wiki/Block-all-cookies-global-Shields-setting"; diff --git a/android/java/org/chromium/chrome/browser/rewards/BraveRewardsPanel.java b/android/java/org/chromium/chrome/browser/rewards/BraveRewardsPanel.java index 911f4363d4f..05562218909 100644 --- a/android/java/org/chromium/chrome/browser/rewards/BraveRewardsPanel.java +++ b/android/java/org/chromium/chrome/browser/rewards/BraveRewardsPanel.java @@ -48,6 +48,7 @@ import org.chromium.base.SysUtils; import org.chromium.brave_rewards.mojom.PublisherStatus; import org.chromium.brave_rewards.mojom.UserType; import org.chromium.brave_rewards.mojom.WalletStatus; +import org.chromium.build.annotations.NullMarked; import org.chromium.chrome.R; import org.chromium.chrome.browser.BraveAdsNativeHelper; import org.chromium.chrome.browser.BraveRewardsBalance; @@ -88,6 +89,7 @@ import java.util.Locale; import java.util.Timer; import java.util.TimerTask; +@NullMarked public class BraveRewardsPanel implements BraveRewardsObserver, BraveRewardsHelper.LargeIconReadyCallback { public static final String PREF_WAS_BRAVE_REWARDS_TURNED_ON = "brave_rewards_turned_on"; diff --git a/android/java/org/chromium/chrome/browser/rewards/onboarding/RewardsOnboarding.java b/android/java/org/chromium/chrome/browser/rewards/onboarding/RewardsOnboarding.java index c001f01d7c6..434c048c4cb 100644 --- a/android/java/org/chromium/chrome/browser/rewards/onboarding/RewardsOnboarding.java +++ b/android/java/org/chromium/chrome/browser/rewards/onboarding/RewardsOnboarding.java @@ -27,6 +27,7 @@ import androidx.core.app.ActivityCompat; import androidx.core.content.res.ResourcesCompat; import org.chromium.base.BuildInfo; +import org.chromium.build.annotations.NullMarked; import org.chromium.chrome.R; import org.chromium.chrome.browser.BraveRewardsHelper; import org.chromium.chrome.browser.BraveRewardsNativeWorker; @@ -46,9 +47,8 @@ import java.util.Collections; import java.util.Locale; import java.util.TreeMap; -/** - * This class is used to show rewards onBoarding UI - **/ +/** This class is used to show rewards onBoarding UI */ +@NullMarked public class RewardsOnboarding implements BraveRewardsObserver { private final View mAnchorView; private final PopupWindow mPopupWindow; diff --git a/android/java/org/chromium/chrome/browser/rewards/tipping/RewardsTippingPanelFragment.java b/android/java/org/chromium/chrome/browser/rewards/tipping/RewardsTippingPanelFragment.java index 438d584ad7e..005db651511 100644 --- a/android/java/org/chromium/chrome/browser/rewards/tipping/RewardsTippingPanelFragment.java +++ b/android/java/org/chromium/chrome/browser/rewards/tipping/RewardsTippingPanelFragment.java @@ -36,6 +36,7 @@ import org.json.JSONException; import org.chromium.base.Log; import org.chromium.brave_rewards.mojom.PublisherStatus; import org.chromium.brave_rewards.mojom.WalletStatus; +import org.chromium.build.annotations.NullMarked; import org.chromium.chrome.R; import org.chromium.chrome.browser.BraveRewardsBalance; import org.chromium.chrome.browser.BraveRewardsExternalWallet; @@ -53,6 +54,7 @@ import org.chromium.ui.text.ChromeClickableSpan; import java.math.RoundingMode; import java.text.DecimalFormat; +@NullMarked public class RewardsTippingPanelFragment extends Fragment implements BraveRewardsObserver { public static final String TAG_FRAGMENT = "tipping_panel_tag"; private static final String TAG = "TippingPanelFragment"; diff --git a/android/java/org/chromium/chrome/browser/rewards/tipping/TippingVerifiedCreatorToolTip.java b/android/java/org/chromium/chrome/browser/rewards/tipping/TippingVerifiedCreatorToolTip.java index ceabea7cd28..46592106044 100644 --- a/android/java/org/chromium/chrome/browser/rewards/tipping/TippingVerifiedCreatorToolTip.java +++ b/android/java/org/chromium/chrome/browser/rewards/tipping/TippingVerifiedCreatorToolTip.java @@ -24,11 +24,13 @@ import android.widget.TextView; import androidx.annotation.NonNull; import androidx.appcompat.content.res.AppCompatResources; +import org.chromium.build.annotations.NullMarked; import org.chromium.chrome.R; import org.chromium.chrome.browser.BraveRewardsHelper; import org.chromium.chrome.browser.customtabs.CustomTabActivity; import org.chromium.ui.text.ChromeClickableSpan; +@NullMarked public class TippingVerifiedCreatorToolTip { private static final String NEW_SIGNUP_DISABLED_URL = "https://support.brave.com/hc/en-us/articles/9312922941069"; diff --git a/android/java/org/chromium/chrome/browser/settings/BraveMainPreferencesBase.java b/android/java/org/chromium/chrome/browser/settings/BraveMainPreferencesBase.java index 5edb04c21e7..f2fd5d28b53 100644 --- a/android/java/org/chromium/chrome/browser/settings/BraveMainPreferencesBase.java +++ b/android/java/org/chromium/chrome/browser/settings/BraveMainPreferencesBase.java @@ -15,6 +15,7 @@ import androidx.preference.Preference; import org.chromium.base.BraveFeatureList; import org.chromium.base.ContextUtils; +import org.chromium.build.annotations.NullMarked; import org.chromium.chrome.R; import org.chromium.chrome.browser.BraveLaunchIntentDispatcher; import org.chromium.chrome.browser.accessibility.settings.BraveAccessibilitySettings; @@ -47,6 +48,7 @@ import org.chromium.ui.base.DeviceFormFactor; import java.util.HashMap; // This excludes some settings in main settings screen. +@NullMarked public abstract class BraveMainPreferencesBase extends BravePreferenceFragment implements Preference.OnPreferenceChangeListener { // sections diff --git a/android/java/org/chromium/chrome/browser/settings/BraveWalletPreferences.java b/android/java/org/chromium/chrome/browser/settings/BraveWalletPreferences.java index 9955d7e3d5e..666fbba0964 100644 --- a/android/java/org/chromium/chrome/browser/settings/BraveWalletPreferences.java +++ b/android/java/org/chromium/chrome/browser/settings/BraveWalletPreferences.java @@ -20,6 +20,7 @@ import org.chromium.base.supplier.ObservableSupplier; import org.chromium.base.supplier.ObservableSupplierImpl; import org.chromium.brave_wallet.mojom.DefaultWallet; import org.chromium.brave_wallet.mojom.KeyringService; +import org.chromium.build.annotations.NullMarked; import org.chromium.chrome.R; import org.chromium.chrome.browser.app.BraveActivity; import org.chromium.chrome.browser.app.domain.WalletModel; @@ -34,6 +35,7 @@ import org.chromium.mojo.system.MojoException; import org.chromium.ui.text.ChromeClickableSpan; import org.chromium.ui.text.SpanApplier; +@NullMarked public class BraveWalletPreferences extends BravePreferenceFragment implements ConnectionErrorHandler, Preference.OnPreferenceChangeListener { private static final String TAG = "WalletPreferences"; diff --git a/android/java/org/chromium/chrome/browser/share/BraveShareDelegateImpl.java b/android/java/org/chromium/chrome/browser/share/BraveShareDelegateImpl.java index 3fa55c66a2c..4e31d1198a4 100644 --- a/android/java/org/chromium/chrome/browser/share/BraveShareDelegateImpl.java +++ b/android/java/org/chromium/chrome/browser/share/BraveShareDelegateImpl.java @@ -9,6 +9,7 @@ import android.content.Context; import org.chromium.base.BravePreferenceKeys; import org.chromium.base.supplier.Supplier; +import org.chromium.build.annotations.NullMarked; import org.chromium.chrome.browser.data_sharing.DataSharingTabManager; import org.chromium.chrome.browser.lifecycle.ActivityLifecycleDispatcher; import org.chromium.chrome.browser.preferences.ChromeSharedPreferences; @@ -17,6 +18,7 @@ import org.chromium.chrome.browser.tab.Tab; import org.chromium.chrome.browser.tabmodel.TabModelSelector; import org.chromium.components.browser_ui.bottomsheet.BottomSheetController; +@NullMarked public class BraveShareDelegateImpl extends ShareDelegateImpl { public BraveShareDelegateImpl( Context context, diff --git a/android/java/org/chromium/chrome/browser/shields/CreateCustomFiltersFragment.java b/android/java/org/chromium/chrome/browser/shields/CreateCustomFiltersFragment.java index 904e8645a46..a55f8665d2f 100644 --- a/android/java/org/chromium/chrome/browser/shields/CreateCustomFiltersFragment.java +++ b/android/java/org/chromium/chrome/browser/shields/CreateCustomFiltersFragment.java @@ -22,6 +22,7 @@ import android.widget.TextView; import org.chromium.base.supplier.ObservableSupplier; import org.chromium.base.supplier.ObservableSupplierImpl; import org.chromium.brave_shields.mojom.FilterListAndroidHandler; +import org.chromium.build.annotations.NullMarked; import org.chromium.chrome.R; import org.chromium.chrome.browser.BraveRewardsHelper; import org.chromium.chrome.browser.customtabs.CustomTabActivity; @@ -31,6 +32,7 @@ import org.chromium.mojo.system.MojoException; import org.chromium.ui.text.ChromeClickableSpan; import org.chromium.ui.widget.Toast; +@NullMarked public class CreateCustomFiltersFragment extends BravePreferenceFragment implements ConnectionErrorHandler { public static final String BRAVE_ADBLOCK_FILTER_SYNTAX_PAGE = diff --git a/android/java/org/chromium/chrome/browser/ui/system/BraveStatusBarColorController.java b/android/java/org/chromium/chrome/browser/ui/system/BraveStatusBarColorController.java index 7de88c43bbc..3fa85875339 100644 --- a/android/java/org/chromium/chrome/browser/ui/system/BraveStatusBarColorController.java +++ b/android/java/org/chromium/chrome/browser/ui/system/BraveStatusBarColorController.java @@ -13,6 +13,7 @@ import androidx.annotation.ColorInt; import org.chromium.base.supplier.ObservableSupplier; import org.chromium.base.supplier.OneshotSupplier; +import org.chromium.build.annotations.NullMarked; import org.chromium.chrome.browser.ActivityTabProvider; import org.chromium.chrome.browser.layouts.LayoutManager; import org.chromium.chrome.browser.lifecycle.ActivityLifecycleDispatcher; @@ -22,6 +23,7 @@ import org.chromium.components.browser_ui.desktop_windowing.DesktopWindowStateMa import org.chromium.components.browser_ui.edge_to_edge.EdgeToEdgeSystemBarColorHelper; import org.chromium.ui.util.ColorUtils; +@NullMarked public class BraveStatusBarColorController extends StatusBarColorController { // Will be removed with bytecode patch public @ColorInt int mBackgroundColorForNtp; diff --git a/android/java/org/chromium/chrome/browser/vpn/adapters/AlwaysOnPagerAdapter.java b/android/java/org/chromium/chrome/browser/vpn/adapters/AlwaysOnPagerAdapter.java index 8dfbb7adc61..4abbca58e45 100644 --- a/android/java/org/chromium/chrome/browser/vpn/adapters/AlwaysOnPagerAdapter.java +++ b/android/java/org/chromium/chrome/browser/vpn/adapters/AlwaysOnPagerAdapter.java @@ -20,6 +20,7 @@ import android.widget.TextView; import androidx.annotation.NonNull; import androidx.viewpager.widget.PagerAdapter; +import org.chromium.build.annotations.NullMarked; import org.chromium.chrome.R; import org.chromium.chrome.browser.customtabs.CustomTabActivity; import org.chromium.ui.text.ChromeClickableSpan; @@ -29,6 +30,7 @@ import org.chromium.ui.text.SpanApplier.SpanInfo; import java.util.Arrays; import java.util.List; +@NullMarked public class AlwaysOnPagerAdapter extends PagerAdapter { private Context mContext; diff --git a/components/permissions/android/java/src/org/chromium/components/permissions/BravePermissionDialogModel.java b/components/permissions/android/java/src/org/chromium/components/permissions/BravePermissionDialogModel.java index fcf162480fd..12d8beafcfb 100644 --- a/components/permissions/android/java/src/org/chromium/components/permissions/BravePermissionDialogModel.java +++ b/components/permissions/android/java/src/org/chromium/components/permissions/BravePermissionDialogModel.java @@ -27,6 +27,7 @@ import android.widget.TextView; import androidx.browser.customtabs.CustomTabsIntent; import org.chromium.base.IntentUtils; +import org.chromium.build.annotations.NullMarked; import org.chromium.ui.LayoutInflaterUtils; import org.chromium.ui.UiUtils; import org.chromium.ui.base.ViewUtils; @@ -37,6 +38,7 @@ import org.chromium.ui.text.SpanApplier; import org.chromium.ui.util.ColorUtils; /* Adds additional items to Permission Dialog. */ +@NullMarked class BravePermissionDialogModel { // Link for Widevine private static final String URL_WIDEVINE_LEARN_MORE =