| commit | 3badc6c549160860c9196af6e8abb930588b5f05 | [log] [tgz] |
|---|---|---|
| author | Henrique Nakashima <hnakashima@chromium.org> | Tue Feb 04 15:09:11 2025 |
| committer | Chromium LUCI CQ <chromium-scoped@luci-project-accounts.iam.gserviceaccount.com> | Tue Feb 04 15:09:11 2025 |
| tree | 473304c945f78db068966e33562890c44cd08c9c | |
| parent | 10c428e246db1865163e6c127619da97f508d5e0 [diff] |
[Android] @NullMark //components/embedder_support/android/metrics Bug: 389129271 Change-Id: Idcd86ba176f1cf58f16e6971a728e347c6c1d51d Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6226365 Owners-Override: Peter Wen <wnwen@chromium.org> Commit-Queue: Peter Wen <wnwen@chromium.org> Auto-Submit: Henrique Nakashima <hnakashima@chromium.org> Reviewed-by: Peter Wen <wnwen@chromium.org> Cr-Commit-Position: refs/heads/main@{#1415556}
diff --git a/components/embedder_support/android/metrics/java/src/org/chromium/components/metrics/AndroidMetricsLogConsumer.java b/components/embedder_support/android/metrics/java/src/org/chromium/components/metrics/AndroidMetricsLogConsumer.java index c0b35c2..bbc35866 100644 --- a/components/embedder_support/android/metrics/java/src/org/chromium/components/metrics/AndroidMetricsLogConsumer.java +++ b/components/embedder_support/android/metrics/java/src/org/chromium/components/metrics/AndroidMetricsLogConsumer.java
@@ -4,10 +4,13 @@ package org.chromium.components.metrics; +import org.chromium.build.annotations.NullMarked; + /** * Used by {@link org.chromium.components.metrics.AndroidMetricsLogUploader} to transport logs to * the underlying platform. */ +@NullMarked public interface AndroidMetricsLogConsumer { /** * Uploads the log to the underlying platform.
diff --git a/components/embedder_support/android/metrics/java/src/org/chromium/components/metrics/AndroidMetricsLogUploader.java b/components/embedder_support/android/metrics/java/src/org/chromium/components/metrics/AndroidMetricsLogUploader.java index 3f90af0..fe1677e 100644 --- a/components/embedder_support/android/metrics/java/src/org/chromium/components/metrics/AndroidMetricsLogUploader.java +++ b/components/embedder_support/android/metrics/java/src/org/chromium/components/metrics/AndroidMetricsLogUploader.java
@@ -7,10 +7,14 @@ import org.jni_zero.CalledByNative; import org.jni_zero.JNINamespace; +import org.chromium.build.annotations.NullMarked; +import org.chromium.build.annotations.Nullable; + /** Passes UMA logs from native to a java uploader. */ @JNINamespace("metrics") +@NullMarked public class AndroidMetricsLogUploader { - private static volatile AndroidMetricsLogConsumer sConsumer; + private static volatile @Nullable AndroidMetricsLogConsumer sConsumer; /** * Configures the consumer of logs data submitted via uploadLog, should be called once during
diff --git a/components/embedder_support/android/metrics/java/src/org/chromium/components/metrics/AndroidMetricsServiceClient.java b/components/embedder_support/android/metrics/java/src/org/chromium/components/metrics/AndroidMetricsServiceClient.java index 09822c5d..3dd1a34 100644 --- a/components/embedder_support/android/metrics/java/src/org/chromium/components/metrics/AndroidMetricsServiceClient.java +++ b/components/embedder_support/android/metrics/java/src/org/chromium/components/metrics/AndroidMetricsServiceClient.java
@@ -13,13 +13,16 @@ import org.chromium.base.BuildInfo; import org.chromium.base.ContextUtils; import org.chromium.base.ThreadUtils; +import org.chromium.build.annotations.NullMarked; +import org.chromium.build.annotations.Nullable; /** Helps the native AndroidMetricsServiceClient call Android Java APIs over JNI. */ @JNINamespace("metrics") +@NullMarked public class AndroidMetricsServiceClient { private static final String PLAY_STORE_PACKAGE_NAME = "com.android.vending"; - private static @InstallerPackageType Integer sInstallerPackageTypeForTesting; + private static @InstallerPackageType @Nullable Integer sInstallerPackageTypeForTesting; @CalledByNative private static @InstallerPackageType int getInstallerPackageType() {