Messaging: Remove VisibleForTesting

Since we removed all tests, no need to keep those flags around either

Change-Id: Icaf71832c459cecbcbddc75f552c60e48ae95189

src/com/android/messaging/util/ContactUtil.java

@@ -39,12 +39,10 @@ import com.android.messaging.datamodel.FrequentContactsCursorQueryData;
 import com.android.messaging.datamodel.data.ParticipantData;
 import com.android.messaging.sms.MmsSmsUtils;
 import com.android.messaging.ui.contact.AddContactsConfirmationDialog;
-import com.google.common.annotations.VisibleForTesting;
 
 /**
  * Utility class including logic to list, filter, and lookup phone and emails in CP2.
  */
-@VisibleForTesting
 public class ContactUtil {
 
     /**
@@ -208,7 +206,6 @@ public class ContactUtil {
         }
     }
 
-    @VisibleForTesting
     public static CursorQueryData getSelf(final Context context) {
         if (!ContactUtil.hasReadContactsPermission()) {
             return CursorQueryData.getEmptyQueryData();
@@ -221,7 +218,6 @@ public class ContactUtil {
      * Get a list of phones sorted by contact name. One contact may have multiple phones.
      * In that case, each phone will be returned as a separate record in the result cursor.
      */
-    @VisibleForTesting
     public static CursorQueryData getPhones(final Context context) {
         if (!ContactUtil.hasReadContactsPermission()) {
             return CursorQueryData.getEmptyQueryData();
@@ -291,7 +287,6 @@ public class ContactUtil {
      * NOTE: This is visible for testing only, clients should only call filterDestination() since
      * we support email addresses as well.
      */
-    @VisibleForTesting
     public static CursorQueryData filterPhones(final Context context, final String query) {
         return filterPhonesInternal(context, Phone.CONTENT_FILTER_URI, query, Directory.DEFAULT);
     }
@@ -323,7 +318,6 @@ public class ContactUtil {
      * NOTE: This is visible for testing only, clients should only call lookupDestination() since
      * we support email addresses as well.
      */
-    @VisibleForTesting
     public static CursorQueryData lookupPhone(final Context context, final String phone) {
         if (!ContactUtil.hasReadContactsPermission()) {
             return CursorQueryData.getEmptyQueryData();
@@ -355,7 +349,6 @@ public class ContactUtil {
      * NOTE: This is visible for testing only, clients should only call filterDestination() since
      * we support email addresses as well.
      */
-    @VisibleForTesting
     public static CursorQueryData filterEmails(final Context context, final String query) {
         return filterEmailsInternal(context, Email.CONTENT_FILTER_URI, query, Directory.DEFAULT);
     }
@@ -388,7 +381,6 @@ public class ContactUtil {
      * NOTE: This is visible for testing only, clients should only call lookupDestination() since
      * we support email addresses as well.
      */
-    @VisibleForTesting
     public static CursorQueryData lookupEmail(final Context context, final String email) {
         if (!ContactUtil.hasReadContactsPermission()) {
             return CursorQueryData.getEmptyQueryData();

src/com/android/messaging/util/Dates.java

@@ -22,7 +22,6 @@ import android.text.format.DateUtils;
 
 import com.android.messaging.Factory;
 import com.android.messaging.R;
-import com.google.common.annotations.VisibleForTesting;
 
 import java.text.SimpleDateFormat;
 import java.time.Instant;
@@ -46,9 +45,9 @@ public class Dates {
     // Callers of methods in this class should never have to specify these; this is really
     // intended only for unit tests.
     @SuppressWarnings("deprecation")
-    @VisibleForTesting public static final int FORCE_12_HOUR = DateUtils.FORMAT_12HOUR;
+    public static final int FORCE_12_HOUR = DateUtils.FORMAT_12HOUR;
     @SuppressWarnings("deprecation")
-    @VisibleForTesting public static final int FORCE_24_HOUR = DateUtils.FORMAT_24HOUR;
+    public static final int FORCE_24_HOUR = DateUtils.FORMAT_24HOUR;
 
     /**
      * Private default constructor
@@ -128,7 +127,6 @@ public class Dates {
                 minPeriodToday);
     }
 
-    @VisibleForTesting
     public static CharSequence getTimestamp(final long time, final long now,
             final boolean abbreviated, final Locale locale, final int flags,
             final boolean minPeriodToday) {

src/com/android/messaging/util/ImageUtils.java

@@ -43,7 +43,6 @@ import com.android.messaging.datamodel.MessagingContentProvider;
 import com.android.messaging.datamodel.media.ImageRequest;
 import com.android.messaging.util.Assert.DoesNotRunOnMainThread;
 import com.android.messaging.util.exif.ExifInterface;
-import com.google.common.annotations.VisibleForTesting;
 import com.google.common.io.Files;
 
 import java.io.ByteArrayOutputStream;
@@ -78,7 +77,6 @@ public class ImageUtils {
         return sInstance;
     }
 
-    @VisibleForTesting
     public static void set(final ImageUtils imageUtils) {
         sInstance = imageUtils;
     }

src/com/android/messaging/util/ImeUtil.java

@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2015 The Android Open Source Project
+ * Copyright (C) 2024 The LineageOS Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,8 +21,6 @@ import androidx.annotation.NonNull;
 import android.view.View;
 import android.view.inputmethod.InputMethodManager;
 
-import com.google.common.annotations.VisibleForTesting;
-
 public class ImeUtil {
     public interface ImeStateObserver {
         void onImeStateChanged(boolean imeOpen);
@@ -52,7 +51,6 @@ public class ImeUtil {
         return sInstance;
     }
 
-    @VisibleForTesting
     public static void set(final ImeUtil imeUtil) {
         sInstance = imeUtil;
     }

src/com/android/messaging/util/WakeLockHelper.java

@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2015 The Android Open Source Project
+ * Copyright (C) 2024 The LineageOS Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,8 +23,6 @@ import android.os.Debug;
 import android.os.PowerManager;
 import android.os.Process;
 
-import com.google.common.annotations.VisibleForTesting;
-
 /**
  * Helper class used to manage wakelock state
  */
@@ -31,7 +30,6 @@ public class WakeLockHelper {
     private static final String TAG = LogUtil.BUGLE_DATAMODEL_TAG;
     private static final boolean VERBOSE = false;
 
-    @VisibleForTesting
     public static final String EXTRA_CALLING_PID = "pid";
 
     private final Object mLock = new Object();