Revert "Revert "Import updated Android SetupCompat Library 231343431""

This reverts commit 232a2831bdbc44a82d27dfa66a01fc05830f4fa3.

Reason for revert: Roll forward

Change-Id: Ia6268a63db726ed3092b44edb23601932a984606

4 files changed, 12 insertions, 13 deletions

diff --git a/main/java/com/google/android/setupcompat/logging/CustomEvent.java b/main/java/com/google/android/setupcompat/logging/CustomEvent.java
index f9aa3b9..98f8d91 100644
--- a/main/java/com/google/android/setupcompat/logging/CustomEvent.java
+++ b/main/java/com/google/android/setupcompat/logging/CustomEvent.java
@@ -23,7 +23,7 @@ import android.os.Parcelable;
 import android.os.PersistableBundle;
 import androidx.annotation.VisibleForTesting;
 import com.google.android.setupcompat.internal.ClockProvider;
-import com.google.common.base.Preconditions;
+import com.google.android.setupcompat.internal.Preconditions;
 import java.util.Objects;
 
 /**
@@ -131,8 +131,8 @@ public final class CustomEvent implements Parcelable {
     assertPersistableBundleIsValid(bundle);
     this.timestampMillis = timestampMillis;
     this.metricKey = metricKey;
-    this.persistableBundle = bundle.deepCopy();
-    this.piiValues = piiValues.deepCopy();
+    this.persistableBundle = new PersistableBundle(bundle);
+    this.piiValues = new PersistableBundle(piiValues);
   }
 
   private final long timestampMillis;
@@ -153,17 +153,16 @@ public final class CustomEvent implements Parcelable {
       }
       Preconditions.checkArgument(
           valid,
-          "Invalid data type for key='%s'. Expected values of type %s, but found [%s].",
-          key,
-          CUSTOM_EVENT_ALLOWED_DATA_TYPES,
-          value);
+          String.format(
+              "Invalid data type for key='%s'. Expected values of type %s, but found [%s].",
+              key, CUSTOM_EVENT_ALLOWED_DATA_TYPES, value));
 
       if (value instanceof String) {
         Preconditions.checkArgument(
             ((String) value).length() <= MAX_STR_LENGTH,
-            "Maximum length of string value for key='%s' cannot exceed %s.",
-            key,
-            MAX_STR_LENGTH);
+            String.format(
+                "Maximum length of string value for key='%s' cannot exceed %s.",
+                key, MAX_STR_LENGTH));
       }
     }
   }
diff --git a/main/java/com/google/android/setupcompat/logging/MetricKey.java b/main/java/com/google/android/setupcompat/logging/MetricKey.java
index fe310f2..7df4a71 100644
--- a/main/java/com/google/android/setupcompat/logging/MetricKey.java
+++ b/main/java/com/google/android/setupcompat/logging/MetricKey.java
@@ -21,7 +21,7 @@ import static com.google.android.setupcompat.internal.Validations.assertLengthIn
 import android.os.Parcel;
 import android.os.Parcelable;
 import androidx.annotation.NonNull;
-import com.google.common.base.Preconditions;
+import com.google.android.setupcompat.internal.Preconditions;
 import java.util.Objects;
 import java.util.regex.Pattern;
 
diff --git a/main/java/com/google/android/setupcompat/logging/SetupMetricsLogger.java b/main/java/com/google/android/setupcompat/logging/SetupMetricsLogger.java
index adfcd81..2869c65 100644
--- a/main/java/com/google/android/setupcompat/logging/SetupMetricsLogger.java
+++ b/main/java/com/google/android/setupcompat/logging/SetupMetricsLogger.java
@@ -19,10 +19,10 @@ package com.google.android.setupcompat.logging;
 import android.content.Context;
 import android.os.Bundle;
 import androidx.annotation.NonNull;
+import com.google.android.setupcompat.internal.Preconditions;
 import com.google.android.setupcompat.internal.SetupCompatServiceInvoker;
 import com.google.android.setupcompat.logging.internal.SetupMetricsLoggingConstants.MetricBundleKeys;
 import com.google.android.setupcompat.logging.internal.SetupMetricsLoggingConstants.MetricType;
-import com.google.common.base.Preconditions;
 import java.util.concurrent.TimeUnit;
 
 /** SetupMetricsLogger provides an easy way to log custom metrics to SetupWizard. */
diff --git a/main/java/com/google/android/setupcompat/logging/Timer.java b/main/java/com/google/android/setupcompat/logging/Timer.java
index 7d2a2c9..ec4b9e0 100644
--- a/main/java/com/google/android/setupcompat/logging/Timer.java
+++ b/main/java/com/google/android/setupcompat/logging/Timer.java
@@ -18,7 +18,7 @@ package com.google.android.setupcompat.logging;
 
 import android.util.Log;
 import com.google.android.setupcompat.internal.ClockProvider;
-import com.google.common.base.Preconditions;
+import com.google.android.setupcompat.internal.Preconditions;
 
 /** Convenience utility to log duration events. Please note that this class is not thread-safe. */
 public final class Timer {