Merge branch 'master' into realtime-rc-merge

Author: qdpham13

firebase-appdistribution-api/api.txt

@@ -24,10 +24,6 @@ package com.google.firebase.appdistribution {
   }
 
   public class FirebaseAppDistributionException extends com.google.firebase.FirebaseException {
-    ctor public FirebaseAppDistributionException(@NonNull String, @NonNull com.google.firebase.appdistribution.FirebaseAppDistributionException.Status);
-    ctor public FirebaseAppDistributionException(@NonNull String, @NonNull com.google.firebase.appdistribution.FirebaseAppDistributionException.Status, @Nullable com.google.firebase.appdistribution.AppDistributionRelease);
-    ctor public FirebaseAppDistributionException(@NonNull String, @NonNull com.google.firebase.appdistribution.FirebaseAppDistributionException.Status, @NonNull Throwable);
-    ctor public FirebaseAppDistributionException(@NonNull String, @NonNull com.google.firebase.appdistribution.FirebaseAppDistributionException.Status, @Nullable com.google.firebase.appdistribution.AppDistributionRelease, @NonNull Throwable);
     method @NonNull public com.google.firebase.appdistribution.FirebaseAppDistributionException.Status getErrorCode();
     method @Nullable public com.google.firebase.appdistribution.AppDistributionRelease getRelease();
   }
@@ -50,8 +46,8 @@ package com.google.firebase.appdistribution {
   }
 
   public interface UpdateProgress {
-    method @NonNull public long getApkBytesDownloaded();
-    method @NonNull public long getApkFileTotalBytes();
+    method public long getApkBytesDownloaded();
+    method public long getApkFileTotalBytes();
     method @NonNull public com.google.firebase.appdistribution.UpdateStatus getUpdateStatus();
   }
 

firebase-appdistribution-api/src/main/java/com/google/firebase/appdistribution/FirebaseAppDistributionException.java

@@ -83,22 +83,26 @@ public enum Status {
   @NonNull private final Status status;
   @Nullable private final AppDistributionRelease release;
 
+  /** @hide */
   public FirebaseAppDistributionException(@NonNull String message, @NonNull Status status) {
     this(message, status, (AppDistributionRelease) null);
   }
 
+  /** @hide */
   public FirebaseAppDistributionException(
       @NonNull String message, @NonNull Status status, @Nullable AppDistributionRelease release) {
     super(message);
     this.status = status;
     this.release = release;
   }
 
+  /** @hide */
   public FirebaseAppDistributionException(
       @NonNull String message, @NonNull Status status, @NonNull Throwable cause) {
     this(message, status, null, cause);
   }
 
+  /** @hide */
   public FirebaseAppDistributionException(
       @NonNull String message,
       @NonNull Status status,

firebase-messaging/src/main/java/com/google/firebase/messaging/FcmExecutors.java

@@ -34,7 +34,7 @@
 class FcmExecutors {
   // TODO(b/117848373): TikTok applications need to comply with go/tiktok-tattletale. Before we
   // migrate to use TikTok thread pools, threads need to use the whitelisted prefix
-  // "Firebase-Messaing".
+  // "Firebase-Messaging".
   private static final String THREAD_NETWORK_IO = "Firebase-Messaging-Network-Io";
   private static final String THREAD_TASK = "Firebase-Messaging-Task";
   private static final String THREAD_FILE = "Firebase-Messaging-File";

firebase-messaging/src/main/java/com/google/firebase/messaging/TopicOperation.java

@@ -22,6 +22,8 @@
 import androidx.annotation.StringDef;
 import androidx.annotation.VisibleForTesting;
 import com.google.android.gms.common.internal.Objects;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
 import java.util.regex.Pattern;
 
 final class TopicOperation {
@@ -117,6 +119,7 @@ public int hashCode() {
   }
 
   @StringDef({TopicOperations.OPERATION_SUBSCRIBE, TopicOperations.OPERATION_UNSUBSCRIBE})
+  @Retention(RetentionPolicy.SOURCE)
   @interface TopicOperations {
     String OPERATION_SUBSCRIBE = "S";
     String OPERATION_UNSUBSCRIBE = "U";