Discharge7443/brave-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[cr136][Android] Fixed some NullAway warnings

Browse Source 
There still many unfixed files:
  android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/BraveIncognitoTabSwitcherPane.java
  android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/BraveTabGroupUiCoordinator.java
  android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/BraveTabSwitcherPaneBase.java
  android/java/org/chromium/chrome/browser/bookmarks/BraveBookmarkManagerCoordinator.java
  android/java/org/chromium/chrome/browser/bookmarks/BraveBookmarkManagerMediator.java
  android/java/org/chromium/chrome/browser/bookmarks/BraveBookmarkToolbarCoordinator.java
  android/java/org/chromium/chrome/browser/bookmarks/BraveBookmarkUtils.java
  android/java/org/chromium/chrome/browser/customtabs/FullScreenCustomTabActivity.java
  android/java/org/chromium/chrome/browser/customtabs/FullScreenCustomTabRootUiCoordinator.java
  android/java/org/chromium/chrome/browser/firstrun/WelcomeOnboardingActivity.java
  android/java/org/chromium/chrome/browser/settings/AppearancePreferences.java
  android/java/org/chromium/chrome/browser/suggestions/tile/BraveMostVisitedTilesLayoutBase.java
  android/java/org/chromium/chrome/browser/toolbar/BraveToolbarManager.java
  android/java/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarCoordinator.java
  android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBottomControlsCoordinator.java
  android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayoutImpl.java
  android/java/org/chromium/chrome/browser/toolbar/top/BraveTopToolbarCoordinator.java
  browser/hub/internal/android/java/src/org/chromium/chrome/browser/hub/BraveHubManagerImpl.java
  browser/hub/internal/android/java/src/org/chromium/chrome/browser/hub/BraveHubToolbarView.java

They are not fixed because they are waiting for the upstream's counterparts to be fixed.
See exclusions at _CheckAndroidNullAwayAnnotatedClasses at src/PRESUBMIT.py

Related Chromium issue:
https://issues.chromium.org/issues/389129271

	Add @NullMarked to all .java Files
This commit is contained in:
AlexeyBarabash
2025-04-16 09:30:33 +01:00
committed by Claudio DeSouza
parent ea06f32c8a
commit b25c92b87c
3 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android/java/org/chromium/chrome/browser/util/TabUtils.java
+13 -8
View File
@@ -13,6 +13,7 @@ import static androidx.browser.customtabs.CustomTabsIntent.COLOR_SCHEME_LIGHT;
import android.app.Activity;
import android.content.Context;
import android.content.Intent;
import android.graphics.drawable.Drawable;
import android.net.Uri;
import android.os.Build;
import android.provider.Browser;
@@ -32,6 +33,8 @@ import org.jni_zero.CalledByNative;
import org.chromium.base.IntentUtils;
import org.chromium.base.Log;
import org.chromium.base.supplier.ObservableSupplier;
import org.chromium.build.annotations.NullMarked;
import org.chromium.build.annotations.Nullable;
import org.chromium.chrome.R;
import org.chromium.chrome.browser.ChromeTabbedActivity;
import org.chromium.chrome.browser.LaunchIntentDispatcher;
@@ -50,6 +53,7 @@ import org.chromium.ui.util.ColorUtils;
import java.lang.reflect.Field;
@NullMarked
public class TabUtils {
private static final String TAG = "TabUtils";
@@ -100,14 +104,11 @@ public class TabUtils {
MenuItem deleteMenuItem = popup.getMenu().findItem(R.id.delete_bookmark);
if (GlobalNightModeStateProviderHolder.getInstance().isInNightMode()) {
addMenuItem.getIcon().setTint(
ContextCompat.getColor(context, R.color.bookmark_menu_text_color));
editMenuItem.getIcon().setTint(
ContextCompat.getColor(context, R.color.bookmark_menu_text_color));
viewMenuItem.getIcon().setTint(
ContextCompat.getColor(context, R.color.bookmark_menu_text_color));
deleteMenuItem.getIcon().setTint(
ContextCompat.getColor(context, R.color.bookmark_menu_text_color));
int tintColor = ContextCompat.getColor(context, R.color.bookmark_menu_text_color);
tintIcon(addMenuItem.getIcon(), tintColor);
tintIcon(editMenuItem.getIcon(), tintColor);
tintIcon(viewMenuItem.getIcon(), tintColor);
tintIcon(addMenuItem.getIcon(), tintColor);
}
if (editingAllowed) {
@@ -379,4 +380,8 @@ public class TabUtils {
}
return 0;
}
private static void tintIcon(@Nullable Drawable icon, int color) {
if (icon != null) icon.setTint(color);
}
}
android/java/org/chromium/chrome/browser/vpn/activities/BraveVpnSupportActivity.java
+4 -1
View File
@@ -25,6 +25,8 @@ import androidx.appcompat.widget.SwitchCompat;
import androidx.appcompat.widget.Toolbar;
import org.chromium.base.supplier.OneshotSupplier;
import org.chromium.build.annotations.NullMarked;
import org.chromium.build.annotations.Nullable;
import org.chromium.chrome.R;
import org.chromium.chrome.browser.about_settings.AboutChromeSettings;
import org.chromium.chrome.browser.about_settings.AboutSettingsBridge;
@@ -36,8 +38,9 @@ import org.chromium.chrome.browser.vpn.utils.BraveVpnPrefUtils;
import java.util.TimeZone;
@NullMarked
public class BraveVpnSupportActivity extends AsyncInitializationActivity {
private BraveFirstRunFlowSequencer mFirstRunFlowSequencer;
private @Nullable BraveFirstRunFlowSequencer mFirstRunFlowSequencer;
private final OneshotSupplier<ProfileProvider> mProfileSupplier;
public BraveVpnSupportActivity() {